!1508 优化代码并修复部分已知bug

Merge pull request !1508 from 喵你个汪/next

Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs

@@ -68,9 +68,9 @@ public class CustomViewEngine : ViewEngineModel
     
     /// <summary>
     /// 格式化主键查询条件
-    /// 例： PrimaryKeysFormat(" && ", "u.{0} == input.{0}")
+    /// 例： PrimaryKeysFormat(" || ", "u.{0} == input.{0}")
     /// 单主键返回 u.Id == input.Id
-    /// 组合主键返回 u.Id == input.Id && u.FkId == input.FkId
+    /// 组合主键返回 u.Id == input.Id || u.FkId == input.FkId
     /// </summary>
     /// <param name="separator">分隔符</param>
     /// <param name="format">模板字符串</param>

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -15,20 +15,20 @@ namespace Admin.NET.Core.Service;
 public class SysCodeGenService : IDynamicApiController, ITransient
 {
     private readonly ISqlSugarClient _db;
-
+    
     private readonly SysCodeGenConfigService _codeGenConfigService;
-    private readonly IViewEngine _viewEngine;
     private readonly CodeGenOptions _codeGenOptions;
+    private readonly IViewEngine _viewEngine;
 
     public SysCodeGenService(ISqlSugarClient db,
         SysCodeGenConfigService codeGenConfigService,
-        IViewEngine viewEngine,
-        IOptions<CodeGenOptions> codeGenOptions)
+        IOptions<CodeGenOptions> codeGenOptions,
+        IViewEngine viewEngine)
     {
         _db = db;
-        _codeGenConfigService = codeGenConfigService;
         _viewEngine = viewEngine;
         _codeGenOptions = codeGenOptions.Value;
+        _codeGenConfigService = codeGenConfigService;
     }
 
     /// <summary>
@@ -450,230 +450,63 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// <returns></returns>
     private async Task AddMenu(string className, string busName, long pid, string menuIcon, string pagePath, List<CodeGenConfig> tableFieldList)
     {
-        var pPath = string.Empty;
-        // 若 pid=0 为顶级则创建菜单目录
+        // 删除已存在的菜单
+        var title = $"{busName}管理";
+        await DeleteMenuTree(title, pid == 0 ? MenuTypeEnum.Dir : MenuTypeEnum.Menu);
+
+        var parentMenuPath = "";
+        var lowerClassName =  className[..1].ToLower() + className[1..];
         if (pid == 0)
         {
-            // 目录
-            var menuType0 = new SysMenu
-            {
-                Pid = 0,
-                Title = busName + "管理",
-                Type = MenuTypeEnum.Dir,
-                Icon = "robot",
-                Path = "/" + className.ToLower(),
-                Component = "Layout",
-            };
-            // 若先前存在则删除本级和下级
-            var menuList0 = await _db.Queryable<SysMenu>().Where(u => u.Title == menuType0.Title && u.Type == menuType0.Type).ToListAsync();
-            if (menuList0.Count > 0)
-            {
-                var listIds = menuList0.Select(u => u.Id).ToList();
-                var childrenIds = new List<long>();
-                foreach (var item in listIds)
-                {
-                    var children = await _db.Queryable<SysMenu>().ToChildListAsync(u => u.Pid, item);
-                    childrenIds.AddRange(children.Select(u => u.Id).ToList());
-                }
-                listIds.AddRange(childrenIds);
-                await _db.Deleteable<SysMenu>().Where(u => listIds.Contains(u.Id)).ExecuteCommandAsync();
-                await _db.Deleteable<SysRoleMenu>().Where(u => listIds.Contains(u.MenuId)).ExecuteCommandAsync();
-            }
-            pid = (await _db.Insertable(menuType0).ExecuteReturnEntityAsync()).Id;
+            // 新增目录，并记录Id
+            var dirMenu = new SysMenu { Pid=0, Title=title, Type=MenuTypeEnum.Dir, Icon="robot", Path="/" + className.ToLower(), Component="Layout" };
+            pid = (await _db.Insertable(dirMenu).ExecuteReturnEntityAsync()).Id;
         }
         else
         {
-            var pMenu = await _db.Queryable<SysMenu>().FirstAsync(u => u.Id == pid) ?? throw Oops.Oh(ErrorCodeEnum.D1505);
-            pPath = pMenu.Path;
-        }
-
-        // 菜单
-        var menuType = new SysMenu
-        {
-            Pid = pid,
-            Title = busName + "管理",
-            Name = className[..1].ToLower() + className[1..],
-            Type = MenuTypeEnum.Menu,
-            Icon = menuIcon,
-            Path = pPath + "/" + className.ToLower(),
-            Component = "/" + pagePath + "/" + className[..1].ToLower() + className[1..] + "/index",
-        };
-        // 若先前存在则删除本级和下级
-        var menuListCurrent = await _db.Queryable<SysMenu>().Where(u => u.Title == menuType.Title && u.Type == menuType.Type).ToListAsync();
-        if (menuListCurrent.Count > 0)
-        {
-            var listIds = menuListCurrent.Select(u => u.Id).ToList();
-            var childListIds = new List<long>();
-            foreach (var item in listIds)
-            {
-                var childList = await _db.Queryable<SysMenu>().ToChildListAsync(u => u.Pid, item);
-                childListIds.AddRange(childList.Select(u => u.Id).ToList());
-            }
-            listIds.AddRange(childListIds);
-            await _db.Deleteable<SysMenu>().Where(u => listIds.Contains(u.Id)).ExecuteCommandAsync();
-            await _db.Deleteable<SysRoleMenu>().Where(u => listIds.Contains(u.MenuId)).ExecuteCommandAsync();
+            var parentMenu = await _db.Queryable<SysMenu>().FirstAsync(u => u.Id == pid) ?? throw Oops.Oh(ErrorCodeEnum.D1505);
+            parentMenuPath = parentMenu.Path;
         }
-
-        var menuPid = (await _db.Insertable(menuType).ExecuteReturnEntityAsync()).Id;
-        int menuOrder = 100;
-        // 按钮-page
-        var menuTypePage = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "查询",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":page",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
-
-        // 按钮-detail
-        var menuTypeDetail = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "详情",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":detail",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
-
-        // 按钮-add
-        var menuTypeAdd = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "增加",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":add",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
-
-        // 按钮-delete
-        var menuTypeDelete = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "删除",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":delete",
-            OrderNo = menuOrder
+        
+        // 新增菜单，并记录Id
+        var rootMenu = new SysMenu { Pid=pid, Title=title, Type=MenuTypeEnum.Menu, Icon=menuIcon, Path=$"{parentMenuPath}/{className.ToLower()}", Component=$"/{pagePath}/{lowerClassName}/index" };
+        pid = (await _db.Insertable(rootMenu).ExecuteReturnEntityAsync()).Id;
+
+        var orderNo = 100;
+        var menuList = new List<SysMenu>
+        {
+            new() { Title="查询", Permission=$"{lowerClassName}:page", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="详情", Permission=$"{lowerClassName}:detail", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="增加", Permission=$"{lowerClassName}:add", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="编辑", Permission=$"{lowerClassName}:update", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="删除", Permission=$"{lowerClassName}:delete", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="批量删除", Permission=$"{lowerClassName}:batchDelete", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="设置状态", Permission=$"{lowerClassName}:setStatus", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="打印", Permission=$"{lowerClassName}:print", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="导入", Permission=$"{lowerClassName}:import", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10},
+            new() { Title="导出", Permission=$"{lowerClassName}:export", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10}
         };
-        menuOrder += 10;
 
-        // 按钮-update
-        var menuTypeUpdate = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "编辑",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":update",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
+        if (tableFieldList.Any(u => u.EffectType is "ForeignKey" or "ApiTreeSelector" && (u.WhetherAddUpdate == "Y" || u.WhetherQuery == "Y")))
+            menuList.Add(new SysMenu { Title="下拉列表数据", Permission=$"{lowerClassName}:dropdownData", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10});
         
-        // 按钮-Status
-        var menuTypeStatus = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "状态",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":setStatus",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
+        foreach (var column in tableFieldList.Where(u => u.EffectType == "Upload"))
+            menuList.Add(new SysMenu { Title=$"上传{column.ColumnComment}", Permission=$"{lowerClassName}:upload{column.PropertyName}", Pid=pid, Type=MenuTypeEnum.Btn, OrderNo=orderNo+=10});
         
-        // 按钮-batchDelete
-        var menuTypeBatchDelete = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "批量删除",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":batchDelete",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
-
-        // 按钮-print
-        var menuTypePrint = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "打印",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":print",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
-
-        // 按钮-import
-        var menuTypeImport = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "导入",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":import",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
-
-        // 按钮-export
-        var menuTypeExport = new SysMenu
-        {
-            Pid = menuPid,
-            Title = "导出",
-            Type = MenuTypeEnum.Btn,
-            Permission = className[..1].ToLower() + className[1..] + ":export",
-            OrderNo = menuOrder
-        };
-        menuOrder += 10;
-
-        var menuList = new List<SysMenu> { menuTypePage, menuTypeDetail, menuTypeAdd, menuTypeStatus, menuTypeDelete, menuTypeBatchDelete, menuTypeUpdate, menuTypePrint, menuTypeImport, menuTypeExport };
-        // 加入ForeignKey、Upload、ApiTreeSelector 等接口的权限
-        // 在生成表格时，有些字段只是查询时显示，不需要填写（WhetherAddUpdate），所以这些字段没必要生成相应接口
-        var fkTableList = tableFieldList.Where(u => u.EffectType == "ForeignKey" && (u.WhetherAddUpdate == "Y" || u.WhetherQuery == "Y")).ToList();
-        foreach (var @column in fkTableList)
-        {
-            var menuType1 = new SysMenu
-            {
-                Pid = menuPid,
-                Title = "外键" + @column.ColumnName,
-                Type = MenuTypeEnum.Btn,
-                Permission = className[..1].ToLower() + className[1..] + ":" + column.FkEntityName + column.ColumnName + "Dropdown",
-                OrderNo = menuOrder
-            };
-            menuOrder += 10;
-            menuList.Add(menuType1);
-        }
-        var treeSelectTableList = tableFieldList.Where(u => u.EffectType == "ApiTreeSelector").ToList();
-        foreach (var @column in treeSelectTableList)
-        {
-            var menuType1 = new SysMenu
-            {
-                Pid = menuPid,
-                Title = "树型" + @column.ColumnName,
-                Type = MenuTypeEnum.Btn,
-                Permission = className[..1].ToLower() + className[1..] + ":" + column.FkEntityName + "Tree",
-                OrderNo = menuOrder
-            };
-            menuOrder += 10;
-            menuList.Add(menuType1);
-        }
-        var uploadTableList = tableFieldList.Where(u => u.EffectType == "Upload").ToList();
-        foreach (var @column in uploadTableList)
-        {
-            var menuType1 = new SysMenu
-            {
-                Pid = menuPid,
-                Title = "上传" + @column.ColumnName,
-                Type = MenuTypeEnum.Btn,
-                Permission = className[..1].ToLower() + className[1..] + ":Upload" + column.ColumnName,
-                OrderNo = menuOrder
-            };
-            menuOrder += 10;
-            menuList.Add(menuType1);
-        }
         await _db.Insertable(menuList).ExecuteCommandAsync();
     }
 
+    /// <summary>
+    /// 根据菜单名称和类型删除关联的菜单树
+    /// </summary>
+    /// <param name="title"></param>
+    /// <param name="type"></param>
+    private async Task DeleteMenuTree(string title, MenuTypeEnum type)
+    {
+        var menuList = await _db.Queryable<SysMenu>().Where(u => u.Title == title && u.Type == type).ToListAsync() ?? new();
+        foreach (var menu in menuList) await App.GetService<SysMenuService>().DeleteMenu(new DeleteMenuInput { Id = menu.Id });
+    }
+
     /// <summary>
     /// 获取模板文件路径集合
     /// </summary>
@@ -712,7 +545,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         if (input.GenerateType!.Substring(1, 1).Contains('1'))
         {
             // 生成到本项目(前端)
-            return new List<string>()
+            return new List<string>
             {
                 indexPath,
                 formModalPath,
@@ -723,7 +556,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         if (input.GenerateType.Substring(1, 1).Contains('2'))
         {
             // 生成到本项目(后端)
-            return new List<string>()
+            return new List<string>
             {
                 servicePath,
                 inputPath,
@@ -732,7 +565,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             };
         }
         // 前后端同时生成到本项目
-        return new List<string>()
+        return new List<string>
         {
             servicePath,
             inputPath,
@@ -765,7 +598,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         var apiJsPath = Path.Combine(zipPath, _codeGenOptions.FrontRootPath, "src", "api", input.PagePath, input.TableName[..1].ToLower() + input.TableName[1..] + ".ts");
         if (input.GenerateType!.StartsWith("11"))
         {
-            return new List<string>()
+            return new List<string>
             {
                 indexPath,
                 formModalPath,
@@ -775,7 +608,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
 
         if (input.GenerateType.StartsWith("12"))
         {
-            return new List<string>()
+            return new List<string>
             {
                 servicePath,
                 inputPath,
@@ -784,7 +617,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             };
         }
 
-        return new List<string>()
+        return new List<string>
         {
             servicePath,
             inputPath,

Admin.NET/Admin.NET.Core/Service/File/Dto/FileInput.cs

@@ -43,7 +43,7 @@ public class DeleteFileInput : BaseIdInput
 /// <summary>
 /// 上传文件
 /// </summary>
-public class UploadFileInput : SysFile
+public class UploadFileInput
 {
     /// <summary>
     /// 文件
@@ -65,13 +65,23 @@ public class UploadFileInput : SysFile
     /// 允许格式：.jpeg.jpg.png.bmp.gif.tif
     /// </summary>
     public string AllowSuffix { get; set; }
+    
+    /// <summary>
+    /// 文件类型
+    /// </summary>
+    public string FileType { get; set; }
 }
 
 /// <summary>
 /// 上传文件Base64
 /// </summary>
-public class UploadFileFromBase64Input : SysFile
+public class UploadFileFromBase64Input
 {
+    /// <summary>
+    /// 文件名
+    /// </summary>
+    public string? FileName { get; set; }
+    
     /// <summary>
     /// 文件内容
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -16,18 +16,21 @@ public class SysMenuService : IDynamicApiController, ITransient
     private readonly SqlSugarRepository<SysMenu> _sysMenuRep;
     private readonly SysRoleMenuService _sysRoleMenuService;
     private readonly SysUserRoleService _sysUserRoleService;
+    private readonly SysUserMenuService _sysUserMenuService;
     private readonly SysCacheService _sysCacheService;
 
     public SysMenuService(UserManager userManager,
         SqlSugarRepository<SysMenu> sysMenuRep,
         SysRoleMenuService sysRoleMenuService,
         SysUserRoleService sysUserRoleService,
+        SysUserMenuService sysUserMenuService,
         SysCacheService sysCacheService)
     {
         _userManager = userManager;
         _sysMenuRep = sysMenuRep;
         _sysRoleMenuService = sysRoleMenuService;
         _sysUserRoleService = sysUserRoleService;
+        _sysUserMenuService = sysUserMenuService;
         _sysCacheService = sysCacheService;
     }
 
@@ -191,6 +194,9 @@ public class SysMenuService : IDynamicApiController, ITransient
 
         // 级联删除角色菜单数据
         await _sysRoleMenuService.DeleteRoleMenuByMenuIdList(menuIdList);
+        
+        // 级联删除用户收藏菜单
+        await _sysUserMenuService.DeleteMenuList(menuIdList);
 
         // 清除缓存
         DeleteMenuCache();

Admin.NET/Admin.NET.Core/Service/User/SysUserMenuService.cs

@@ -54,17 +54,6 @@ public class SysUserMenuService : IDynamicApiController, ITransient
         await _sysUserMenuRep.DeleteAsync(u => u.UserId == _userManager.UserId && input.MenuIdList.Contains(u.MenuId));
     }
 
-    /// <summary>
-    /// 清空当前用户收藏的菜单 🔖
-    /// </summary>
-    /// <returns></returns>
-    [ApiDescriptionSettings(Name = "ClearUserMenu"), HttpPost]
-    [DisplayName("清空当前用户收藏的菜单")]
-    public async Task ClearUserMenu()
-    {
-        await _sysUserMenuRep.DeleteAsync(u => u.UserId == _userManager.UserId);
-    }
-
     /// <summary>
     /// 获取当前用户收藏的菜单集合 🔖
     /// </summary>
@@ -88,4 +77,25 @@ public class SysUserMenuService : IDynamicApiController, ITransient
         return await _sysUserMenuRep.AsQueryable()
             .Where(u => u.UserId == _userManager.UserId).Select(u => u.MenuId).ToListAsync();
     }
+    
+    /// <summary>
+    /// 删除指定用户的收藏菜单
+    /// </summary>
+    /// <returns></returns>
+    [NonAction]
+    public async Task DeleteUserMenuList(long userId)
+    {
+        await _sysUserMenuRep.DeleteAsync(u => u.UserId == userId);
+    }
+
+    /// <summary>
+    /// 批量删除收藏菜单
+    /// </summary>
+    /// <param name="ids"></param>
+    [NonAction]
+    public async Task DeleteMenuList(List<long> ids)
+    {
+        if (ids == null || ids.Count == 0) return;
+        await _sysUserMenuRep.DeleteAsync(u => ids.Contains(u.MenuId));
+    }
 }

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -18,6 +18,7 @@ public class SysUserService : IDynamicApiController, ITransient
     private readonly SysUserRoleService _sysUserRoleService;
     private readonly SysConfigService _sysConfigService;
     private readonly SysOnlineUserService _sysOnlineUserService;
+    private readonly SysUserMenuService _sysUserMenuService;
     private readonly SysCacheService _sysCacheService;
     private readonly SysUserLdapService _sysUserLdapService;
     private readonly SqlSugarRepository<SysUser> _sysUserRep;
@@ -32,6 +33,7 @@ public class SysUserService : IDynamicApiController, ITransient
         SysCacheService sysCacheService,
         SysUserLdapService sysUserLdapService,
         SqlSugarRepository<SysUser> sysUserRep,
+        SysUserMenuService sysUserMenuService,
         SysUserEventHandler sysUserEventHandler)
     {
         _userManager = userManager;
@@ -42,6 +44,7 @@ public class SysUserService : IDynamicApiController, ITransient
         _sysOnlineUserService = sysOnlineUserService;
         _sysCacheService = sysCacheService;
         _sysUserLdapService = sysUserLdapService;
+        _sysUserMenuService = sysUserMenuService;
         _sysUserRep = sysUserRep;
         _sysUserEventHandler = sysUserEventHandler;
     }
@@ -201,6 +204,9 @@ public class SysUserService : IDynamicApiController, ITransient
 
         // 删除域账号
         await _sysUserLdapService.DeleteUserLdapByUserId(input.Id);
+        
+        // 删除用户收藏菜单
+        await _sysUserMenuService.DeleteUserMenuList(input.Id);
 
         // 执行订阅事件
         _sysUserEventHandler.OnEvent(this, SysUserEventTypeEnum.Delete, input);

Admin.NET/Admin.NET.Web.Entry/wwwroot/template/Service.cs.vm

@@ -132,11 +132,15 @@ public class @(Model.ClassName)Service : IDynamicApiController, ITransient
         }
         }
         var entity = input.Adapt<@(Model.ClassName)>();
-        await _@(Model.LowerClassName)Rep.AsUpdateable(entity).IgnoreColumns(u => new {
-        @foreach (var column in Model.IgnoreUpdateFieldList) {
+        await _@(Model.LowerClassName)Rep.AsUpdateable(entity)
+        @if (Model.IgnoreUpdateFieldList.Count > 0) {
+        @:.IgnoreColumns(u => new {
+        foreach (var column in Model.IgnoreUpdateFieldList) {
             @:u.@(column.PropertyName),
         }
-        }).ExecuteCommandAsync();
+        @:})
+        }
+        .ExecuteCommandAsync();
     }
 
     /// <summary>

Web/src/api-services/apis/sys-ldap-api.ts

@@ -19,6 +19,7 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 import { AddSysLdapInput } from '../models';
 import { AdminResultInt64 } from '../models';
 import { AdminResultListSysLdap } from '../models';
+import { AdminResultListSysUserLdap } from '../models';
 import { AdminResultSqlSugarPagedListSysLdap } from '../models';
 import { AdminResultSysLdap } from '../models';
 import { DeleteSysLdapInput } from '../models';
@@ -513,7 +514,7 @@ export const SysLdapApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+        async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysUserLdap>>> {
             const localVarAxiosArgs = await SysLdapApiAxiosParamCreator(configuration).apiSysLdapSyncUserPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
@@ -609,7 +610,7 @@ export const SysLdapApiFactory = function (configuration?: Configuration, basePa
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+        async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysUserLdap>> {
             return SysLdapApiFp(configuration).apiSysLdapSyncUserPost(body, options).then((request) => request(axios, basePath));
         },
         /**
@@ -705,7 +706,7 @@ export class SysLdapApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysLdapApi
      */
-    public async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+    public async apiSysLdapSyncUserPost(body?: SyncSysLdapInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysUserLdap>> {
         return SysLdapApiFp(this.configuration).apiSysLdapSyncUserPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**

Web/src/api-services/apis/sys-user-menu-api.ts

@@ -73,49 +73,6 @@ export const SysUserMenuApiAxiosParamCreator = function (configuration?: Configu
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @summary 清空当前用户收藏的菜单 🔖
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        apiSysUserMenuClearUserMenuPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/sysUserMenu/clearUserMenu`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-            // http bearer authentication required
-            if (configuration && configuration.accessToken) {
-                const accessToken = typeof configuration.accessToken === 'function'
-                    ? await configuration.accessToken()
-                    : await configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
-            }
-
-            const query = new URLSearchParams(localVarUrlObj.search);
-            for (const key in localVarQueryParameter) {
-                query.set(key, localVarQueryParameter[key]);
-            }
-            for (const key in options.params) {
-                query.set(key, options.params[key]);
-            }
-            localVarUrlObj.search = (new URLSearchParams(query)).toString();
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @summary 取消收藏菜单 🔖
@@ -273,19 +230,6 @@ export const SysUserMenuApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
-        /**
-         * 
-         * @summary 清空当前用户收藏的菜单 🔖
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysUserMenuClearUserMenuPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysUserMenuApiAxiosParamCreator(configuration).apiSysUserMenuClearUserMenuPost(options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
         /**
          * 
          * @summary 取消收藏菜单 🔖
@@ -345,15 +289,6 @@ export const SysUserMenuApiFactory = function (configuration?: Configuration, ba
         async apiSysUserMenuAddPost(body?: UserMenuInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
             return SysUserMenuApiFp(configuration).apiSysUserMenuAddPost(body, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @summary 清空当前用户收藏的菜单 🔖
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async apiSysUserMenuClearUserMenuPost(options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysUserMenuApiFp(configuration).apiSysUserMenuClearUserMenuPost(options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @summary 取消收藏菜单 🔖
@@ -403,16 +338,6 @@ export class SysUserMenuApi extends BaseAPI {
     public async apiSysUserMenuAddPost(body?: UserMenuInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
         return SysUserMenuApiFp(this.configuration).apiSysUserMenuAddPost(body, options).then((request) => request(this.axios, this.basePath));
     }
-    /**
-     * 
-     * @summary 清空当前用户收藏的菜单 🔖
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysUserMenuApi
-     */
-    public async apiSysUserMenuClearUserMenuPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysUserMenuApiFp(this.configuration).apiSysUserMenuClearUserMenuPost(options).then((request) => request(this.axios, this.basePath));
-    }
     /**
      * 
      * @summary 取消收藏菜单 🔖

Web/src/api-services/models/admin-result-list-sys-user-ldap.ts

@@ -0,0 +1,57 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+import { SysUserLdap } from './sys-user-ldap';
+/**
+ * 全局返回结果
+ * @export
+ * @interface AdminResultListSysUserLdap
+ */
+export interface AdminResultListSysUserLdap {
+    /**
+     * 状态码
+     * @type {number}
+     * @memberof AdminResultListSysUserLdap
+     */
+    code?: number;
+    /**
+     * 类型success、warning、error
+     * @type {string}
+     * @memberof AdminResultListSysUserLdap
+     */
+    type?: string | null;
+    /**
+     * 错误信息
+     * @type {string}
+     * @memberof AdminResultListSysUserLdap
+     */
+    message?: string | null;
+    /**
+     * 数据
+     * @type {Array<SysUserLdap>}
+     * @memberof AdminResultListSysUserLdap
+     */
+    result?: Array<SysUserLdap> | null;
+    /**
+     * 附加数据
+     * @type {any}
+     * @memberof AdminResultListSysUserLdap
+     */
+    extras?: any | null;
+    /**
+     * 时间
+     * @type {Date}
+     * @memberof AdminResultListSysUserLdap
+     */
+    time?: Date;
+}

Web/src/api-services/models/index.ts

@@ -58,6 +58,7 @@ export * from './admin-result-list-sys-region';
 export * from './admin-result-list-sys-schedule';
 export * from './admin-result-list-sys-user';
 export * from './admin-result-list-sys-user-ext-org';
+export * from './admin-result-list-sys-user-ldap';
 export * from './admin-result-list-sys-wechat-refund';
 export * from './admin-result-list-table-output';
 export * from './admin-result-login-output';
@@ -345,6 +346,7 @@ export * from './sys-role';
 export * from './sys-schedule';
 export * from './sys-user';
 export * from './sys-user-ext-org';
+export * from './sys-user-ldap';
 export * from './sys-wechat-pay';
 export * from './sys-wechat-refund';
 export * from './sys-wechat-user';

Web/src/api-services/models/sys-file-upload-file-body.ts

@@ -11,13 +11,6 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { AccountTypeEnum } from './account-type-enum';
-import { CardTypeEnum } from './card-type-enum';
-import { CultureLevelEnum } from './culture-level-enum';
-import { GenderEnum } from './gender-enum';
-import { StatusEnum } from './status-enum';
-import { SysOrg } from './sys-org';
-import { SysUser } from './sys-user';
 /**
  * 
  * @export
@@ -49,1299 +42,9 @@ export interface SysFileUploadFileBody {
      */
     allowSuffix?: string;
     /**
-     * 提供者
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    provider?: string;
-    /**
-     * 仓储名称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    bucketName?: string;
-    /**
-     * 文件名称（源文件名）
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    fileName?: string;
-    /**
-     * 文件后缀
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    suffix?: string;
-    /**
-     * 存储路径
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    filePath?: string;
-    /**
-     * 文件大小KB
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    sizeKb?: number;
-    /**
-     * 文件大小信息-计算后的
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    sizeInfo?: string;
-    /**
-     * 外链地址-OSS上传后生成外链地址方便前端预览
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    url?: string;
-    /**
-     * 文件MD5
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    fileMd5?: string;
-    /**
-     * 关联对象名称（如子对象）
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    relationName?: string;
-    /**
-     * 关联对象Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    relationId?: number;
-    /**
-     * 所属Id（如主对象）
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    belongId?: number;
-    /**
-     * 文件类别
+     * 文件类型
      * @type {string}
      * @memberof SysFileUploadFileBody
      */
     fileType?: string;
-    /**
-     * 是否公开  若为true则所有人都可以查看，默认只有自己或有权限的可以查看
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    isPublic?: boolean;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    tenantId?: number;
-    /**
-     * 创建者部门Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgId?: number;
-    /**
-     * 父Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgPid?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgName: string;
-    /**
-     * 编码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgCode?: string;
-    /**
-     * 级别
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgLevel?: number;
-    /**
-     * 机构类型-数据字典
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgType?: string;
-    /**
-     * 负责人Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorId?: number;
-    /**
-     * 账号
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorAccount: string;
-    /**
-     * 密码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorPassword?: string;
-    /**
-     * 真实姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorRealName?: string;
-    /**
-     * 昵称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorNickName?: string;
-    /**
-     * 头像
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorAvatar?: string;
-    /**
-     * 
-     * @type {GenderEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSex?: GenderEnum;
-    /**
-     * 年龄
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorAge?: number;
-    /**
-     * 出生日期
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorBirthday?: Date;
-    /**
-     * 民族
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorNation?: string;
-    /**
-     * 手机号码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorPhone?: string;
-    /**
-     * 
-     * @type {CardTypeEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorCardType?: CardTypeEnum;
-    /**
-     * 身份证号
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorIdCardNum?: string;
-    /**
-     * 邮箱
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorEmail?: string;
-    /**
-     * 地址
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorAddress?: string;
-    /**
-     * 
-     * @type {CultureLevelEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorCultureLevel?: CultureLevelEnum;
-    /**
-     * 政治面貌
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorPoliticalOutlook?: string;
-    /**
-     * 毕业院校
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorCollege?: string;
-    /**
-     * 办公电话
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorOfficePhone?: string;
-    /**
-     * 紧急联系人
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorEmergencyContact?: string;
-    /**
-     * 紧急联系人电话
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorEmergencyPhone?: string;
-    /**
-     * 紧急联系人地址
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorEmergencyAddress?: string;
-    /**
-     * 个人简介
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorIntroduction?: string;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorOrderNo?: number;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorStatus?: StatusEnum;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorRemark?: string;
-    /**
-     * 
-     * @type {AccountTypeEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorAccountType?: AccountTypeEnum;
-    /**
-     * 直属机构Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorOrgId?: number;
-    /**
-     * 父Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgPid?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgName: string;
-    /**
-     * 编码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgCode?: string;
-    /**
-     * 级别
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgLevel?: number;
-    /**
-     * 机构类型-数据字典
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgType?: string;
-    /**
-     * 负责人Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgDirectorId?: number;
-    /**
-     * 
-     * @type {SysUser}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgDirector?: SysUser;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgOrderNo?: number;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgStatus?: StatusEnum;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgRemark?: string;
-    /**
-     * 机构子项
-     * @type {Array<SysOrg>}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgChildren?: Array<SysOrg>;
-    /**
-     * 是否禁止选中
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgDisabled?: boolean;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgTenantId?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgCreateTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgUpdateTime?: Date;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgCreateUserId?: number;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgCreateUserName?: string;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgUpdateUserId?: number;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgUpdateUserName?: string;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgIsDelete?: boolean;
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysOrgId?: number;
-    /**
-     * 直属主管Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserId?: number;
-    /**
-     * 账号
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserAccount: string;
-    /**
-     * 密码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserPassword?: string;
-    /**
-     * 真实姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserRealName?: string;
-    /**
-     * 昵称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserNickName?: string;
-    /**
-     * 头像
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserAvatar?: string;
-    /**
-     * 
-     * @type {GenderEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSex?: GenderEnum;
-    /**
-     * 年龄
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserAge?: number;
-    /**
-     * 出生日期
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserBirthday?: Date;
-    /**
-     * 民族
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserNation?: string;
-    /**
-     * 手机号码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserPhone?: string;
-    /**
-     * 
-     * @type {CardTypeEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserCardType?: CardTypeEnum;
-    /**
-     * 身份证号
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserIdCardNum?: string;
-    /**
-     * 邮箱
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserEmail?: string;
-    /**
-     * 地址
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserAddress?: string;
-    /**
-     * 
-     * @type {CultureLevelEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserCultureLevel?: CultureLevelEnum;
-    /**
-     * 政治面貌
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserPoliticalOutlook?: string;
-    /**
-     * 毕业院校
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserCollege?: string;
-    /**
-     * 办公电话
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserOfficePhone?: string;
-    /**
-     * 紧急联系人
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserEmergencyContact?: string;
-    /**
-     * 紧急联系人电话
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserEmergencyPhone?: string;
-    /**
-     * 紧急联系人地址
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserEmergencyAddress?: string;
-    /**
-     * 个人简介
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserIntroduction?: string;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserOrderNo?: number;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserStatus?: StatusEnum;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserRemark?: string;
-    /**
-     * 
-     * @type {AccountTypeEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserAccountType?: AccountTypeEnum;
-    /**
-     * 直属机构Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserOrgId?: number;
-    /**
-     * 父Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgPid?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgName: string;
-    /**
-     * 编码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgCode?: string;
-    /**
-     * 级别
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgLevel?: number;
-    /**
-     * 机构类型-数据字典
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgType?: string;
-    /**
-     * 负责人Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgDirectorId?: number;
-    /**
-     * 
-     * @type {SysUser}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgDirector?: SysUser;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgOrderNo?: number;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgStatus?: StatusEnum;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgRemark?: string;
-    /**
-     * 机构子项
-     * @type {Array<SysOrg>}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgChildren?: Array<SysOrg>;
-    /**
-     * 是否禁止选中
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgDisabled?: boolean;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgTenantId?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgCreateTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgUpdateTime?: Date;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgCreateUserId?: number;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgCreateUserName?: string;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgUpdateUserId?: number;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgUpdateUserName?: string;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgIsDelete?: boolean;
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysOrgId?: number;
-    /**
-     * 直属主管Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserManagerUserId?: number;
-    /**
-     * 
-     * @type {SysUser}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserManagerUser?: SysUser;
-    /**
-     * 职位Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserPosId?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosName: string;
-    /**
-     * 编码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosCode?: string;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosOrderNo?: number;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosRemark?: string;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosStatus?: StatusEnum;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosTenantId?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosCreateTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosUpdateTime?: Date;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosCreateUserId?: number;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosCreateUserName?: string;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosUpdateUserId?: number;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosUpdateUserName?: string;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosIsDelete?: boolean;
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSysPosId?: number;
-    /**
-     * 工号
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserJobNum?: string;
-    /**
-     * 职级
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserPosLevel?: string;
-    /**
-     * 职称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserPosTitle?: string;
-    /**
-     * 擅长领域
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserExpertise?: string;
-    /**
-     * 办公区域
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserOfficeZone?: string;
-    /**
-     * 办公室
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserOffice?: string;
-    /**
-     * 入职日期
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserJoinDate?: Date;
-    /**
-     * 最新登录Ip
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserLastLoginIp?: string;
-    /**
-     * 最新登录地点
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserLastLoginAddress?: string;
-    /**
-     * 最新登录时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserLastLoginTime?: Date;
-    /**
-     * 最新登录设备
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserLastLoginDevice?: string;
-    /**
-     * 电子签名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserSignature?: string;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserTenantId?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserCreateTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserUpdateTime?: Date;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserCreateUserId?: number;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserCreateUserName?: string;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserUpdateUserId?: number;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserUpdateUserName?: string;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserIsDelete?: boolean;
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorManagerUserId?: number;
-    /**
-     * 职位Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorPosId?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosName: string;
-    /**
-     * 编码
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosCode?: string;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosOrderNo?: number;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosRemark?: string;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosStatus?: StatusEnum;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosTenantId?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosCreateTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosUpdateTime?: Date;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosCreateUserId?: number;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosCreateUserName?: string;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosUpdateUserId?: number;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosUpdateUserName?: string;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosIsDelete?: boolean;
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSysPosId?: number;
-    /**
-     * 工号
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorJobNum?: string;
-    /**
-     * 职级
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorPosLevel?: string;
-    /**
-     * 职称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorPosTitle?: string;
-    /**
-     * 擅长领域
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorExpertise?: string;
-    /**
-     * 办公区域
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorOfficeZone?: string;
-    /**
-     * 办公室
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorOffice?: string;
-    /**
-     * 入职日期
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorJoinDate?: Date;
-    /**
-     * 最新登录Ip
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorLastLoginIp?: string;
-    /**
-     * 最新登录地点
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorLastLoginAddress?: string;
-    /**
-     * 最新登录时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorLastLoginTime?: Date;
-    /**
-     * 最新登录设备
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorLastLoginDevice?: string;
-    /**
-     * 电子签名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorSignature?: string;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorTenantId?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorCreateTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorUpdateTime?: Date;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorCreateUserId?: number;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorCreateUserName?: string;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorUpdateUserId?: number;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorUpdateUserName?: string;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorIsDelete?: boolean;
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDirectorId?: number;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgOrderNo?: number;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgStatus?: StatusEnum;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgRemark?: string;
-    /**
-     * 机构子项
-     * @type {Array<SysOrg>}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgChildren?: Array<SysOrg>;
-    /**
-     * 是否禁止选中
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgDisabled?: boolean;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgTenantId?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgCreateTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgUpdateTime?: Date;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgCreateUserId?: number;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgCreateUserName?: string;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgUpdateUserId?: number;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgUpdateUserName?: string;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgIsDelete?: boolean;
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgId?: number;
-    /**
-     * 创建者部门名称
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createOrgName?: string;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    createTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysFileUploadFileBody
-     */
-    updateTime?: Date;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    createUserId?: number;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    createUserName?: string;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    updateUserId?: number;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof SysFileUploadFileBody
-     */
-    updateUserName?: string;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysFileUploadFileBody
-     */
-    isDelete?: boolean;
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysFileUploadFileBody
-     */
-    id?: number;
 }

Web/src/api-services/models/sys-user-ldap.ts

@@ -0,0 +1,134 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+/**
+ * 系统用户域配置表
+ * @export
+ * @interface SysUserLdap
+ */
+export interface SysUserLdap {
+    /**
+     * 雪花Id
+     * @type {number}
+     * @memberof SysUserLdap
+     */
+    id?: number;
+    /**
+     * 创建时间
+     * @type {Date}
+     * @memberof SysUserLdap
+     */
+    createTime?: Date;
+    /**
+     * 更新时间
+     * @type {Date}
+     * @memberof SysUserLdap
+     */
+    updateTime?: Date | null;
+    /**
+     * 创建者Id
+     * @type {number}
+     * @memberof SysUserLdap
+     */
+    createUserId?: number | null;
+    /**
+     * 创建者姓名
+     * @type {string}
+     * @memberof SysUserLdap
+     */
+    createUserName?: string | null;
+    /**
+     * 修改者Id
+     * @type {number}
+     * @memberof SysUserLdap
+     */
+    updateUserId?: number | null;
+    /**
+     * 修改者姓名
+     * @type {string}
+     * @memberof SysUserLdap
+     */
+    updateUserName?: string | null;
+    /**
+     * 软删除
+     * @type {boolean}
+     * @memberof SysUserLdap
+     */
+    isDelete?: boolean;
+    /**
+     * 租户Id
+     * @type {number}
+     * @memberof SysUserLdap
+     */
+    tenantId?: number | null;
+    /**
+     * 用户Id
+     * @type {number}
+     * @memberof SysUserLdap
+     */
+    userId?: number;
+    /**
+     * 域账号  AD域对应sAMAccountName  Ldap对应uid
+     * @type {string}
+     * @memberof SysUserLdap
+     */
+    account: string;
+    /**
+     * 域用户名
+     * @type {string}
+     * @memberof SysUserLdap
+     */
+    userName?: string | null;
+    /**
+     * 对应EmployeeId(用于数据导入对照)
+     * @type {string}
+     * @memberof SysUserLdap
+     */
+    employeeId?: string | null;
+    /**
+     * 组织代码
+     * @type {string}
+     * @memberof SysUserLdap
+     */
+    deptCode?: string | null;
+    /**
+     * 最后设置密码时间
+     * @type {Date}
+     * @memberof SysUserLdap
+     */
+    pwdLastSetTime?: Date | null;
+    /**
+     * 邮箱
+     * @type {string}
+     * @memberof SysUserLdap
+     */
+    mail?: string | null;
+    /**
+     * 检查账户是否已过期
+     * @type {boolean}
+     * @memberof SysUserLdap
+     */
+    accountExpiresFlag?: boolean;
+    /**
+     * 密码设置是否永不过期
+     * @type {boolean}
+     * @memberof SysUserLdap
+     */
+    dontExpiresFlag?: boolean;
+    /**
+     * DN
+     * @type {string}
+     * @memberof SysUserLdap
+     */
+    dn?: string | null;
+}

Web/src/api-services/models/upload-file-from-base64-input.ts

@@ -18,155 +18,11 @@
  */
 export interface UploadFileFromBase64Input {
     /**
-     * 雪花Id
-     * @type {number}
-     * @memberof UploadFileFromBase64Input
-     */
-    id?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof UploadFileFromBase64Input
-     */
-    createTime?: Date;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof UploadFileFromBase64Input
-     */
-    updateTime?: Date | null;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof UploadFileFromBase64Input
-     */
-    createUserId?: number | null;
-    /**
-     * 创建者姓名
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    createUserName?: string | null;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof UploadFileFromBase64Input
-     */
-    updateUserId?: number | null;
-    /**
-     * 修改者姓名
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    updateUserName?: string | null;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof UploadFileFromBase64Input
-     */
-    isDelete?: boolean;
-    /**
-     * 创建者部门Id
-     * @type {number}
-     * @memberof UploadFileFromBase64Input
-     */
-    createOrgId?: number | null;
-    /**
-     * 创建者部门名称
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    createOrgName?: string | null;
-    /**
-     * 租户Id
-     * @type {number}
-     * @memberof UploadFileFromBase64Input
-     */
-    tenantId?: number | null;
-    /**
-     * 提供者
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    provider?: string | null;
-    /**
-     * 仓储名称
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    bucketName?: string | null;
-    /**
-     * 文件名称（源文件名）
+     * 文件名
      * @type {string}
      * @memberof UploadFileFromBase64Input
      */
     fileName?: string | null;
-    /**
-     * 文件后缀
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    suffix?: string | null;
-    /**
-     * 存储路径
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    filePath?: string | null;
-    /**
-     * 文件大小KB
-     * @type {number}
-     * @memberof UploadFileFromBase64Input
-     */
-    sizeKb?: number;
-    /**
-     * 文件大小信息-计算后的
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    sizeInfo?: string | null;
-    /**
-     * 外链地址-OSS上传后生成外链地址方便前端预览
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    url?: string | null;
-    /**
-     * 文件MD5
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    fileMd5?: string | null;
-    /**
-     * 关联对象名称（如子对象）
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    relationName?: string | null;
-    /**
-     * 关联对象Id
-     * @type {number}
-     * @memberof UploadFileFromBase64Input
-     */
-    relationId?: number | null;
-    /**
-     * 所属Id（如主对象）
-     * @type {number}
-     * @memberof UploadFileFromBase64Input
-     */
-    belongId?: number | null;
-    /**
-     * 文件类别
-     * @type {string}
-     * @memberof UploadFileFromBase64Input
-     */
-    fileType?: string | null;
-    /**
-     * 是否公开  若为true则所有人都可以查看，默认只有自己或有权限的可以查看
-     * @type {boolean}
-     * @memberof UploadFileFromBase64Input
-     */
-    isPublic?: boolean;
     /**
      * 文件内容
      * @type {string}

Web/src/views/system/file/component/editSysfile.vue

@@ -71,7 +71,7 @@ import { ElMessage } from 'element-plus';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysFileApi } from '/@/api-services/api';
-import { FileInput } from '/@/api-services/models';
+import { SysFile } from '/@/api-services/models';
 
 const props = defineProps({
 	title: String,
@@ -81,7 +81,7 @@ const emits = defineEmits(['handleQuery']);
 const ruleFormRef = ref();
 const state = reactive({
 	isShowDialog: false,
-	ruleForm: {} as FileInput,
+	ruleForm: {} as SysFile,
 });
 
 // 打开弹窗