Ver código fonte

😎1、代码优化 2、更新前端接口请求文件 3、升级依赖

zuohuaijun 1 ano atrás
pai
commit
283d74841d

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

@@ -37,7 +37,7 @@
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.8.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.9.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.170" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.8" />

+ 4 - 4
Admin.NET/Admin.NET.Core/Job/WechatAccessTokenCheckJob.cs

@@ -6,6 +6,9 @@
 
 namespace Admin.NET.Core;
 
+/// <summary>
+/// 微信AccessToken有效性检查作业任务
+/// </summary>
 [JobDetail("job_WechatAccessTokenCheckJob", Description = "微信AccessToken有效性检查", GroupName = "default", Concurrent = false)]
 [PeriodSeconds(60, TriggerId = "trigger_WechatAccessTokenCheckJob", Description = "微信AccessToken有效性检查", RunOnStart = true)]
 public class WechatAccessTokenCheckJob : IJob
@@ -19,7 +22,6 @@ public class WechatAccessTokenCheckJob : IJob
         _logger = loggerFactory.CreateLogger(nameof(WechatAccessTokenCheckJob));
     }
 
-
     public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken)
     {
         using var serviceScope = _scopeFactory.CreateScope();
@@ -27,7 +29,5 @@ public class WechatAccessTokenCheckJob : IJob
         var factory = serviceScope.ServiceProvider.GetService<WechatApiClientFactory>();
         await factory.CheckWechatAccessTokenAsync();
         await factory.CheckWxOpenAccessTokenAsync();
-
-
     }
-}
+}

+ 11 - 25
Admin.NET/Admin.NET.Core/Service/Wechat/WechatApiHttpClient.cs

@@ -15,14 +15,13 @@ public partial class WechatApiClientFactory : ISingleton
 {
     private readonly IHttpClientFactory _httpClientFactory;
     public readonly WechatOptions _wechatOptions;
-    private readonly SysCacheService _sysCacheSrv;
+    private readonly SysCacheService _sysCacheService;
 
-
-    public WechatApiClientFactory(IHttpClientFactory httpClientFactory, IOptions<WechatOptions> wechatOptions, SysCacheService sysCacheSrv)
+    public WechatApiClientFactory(IHttpClientFactory httpClientFactory, IOptions<WechatOptions> wechatOptions, SysCacheService sysCacheService)
     {
         _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
         _wechatOptions = wechatOptions.Value ?? throw new ArgumentNullException(nameof(wechatOptions));
-        _sysCacheSrv = sysCacheSrv;
+        _sysCacheService = sysCacheService;
     }
 
     /// <summary>
@@ -85,28 +84,23 @@ public partial class WechatApiClientFactory : ISingleton
         return client;
     }
 
-
-
-
     /// <summary>
     /// 获取微信公众号AccessToken
     /// </summary>
     /// <returns></returns>
     public async Task<string> TryGetWechatAccessTokenAsync()
     {
-        var _sysCacheSrv = App.GetRequiredService<SysCacheService>();
-
-        if (!_sysCacheSrv.ExistKey($"WxAccessToken_{_wechatOptions.WechatAppId}") || string.IsNullOrEmpty(_sysCacheSrv.Get<string>($"WxAccessToken_{_wechatOptions.WechatAppId}")))
+        if (!_sysCacheService.ExistKey($"WxAccessToken_{_wechatOptions.WechatAppId}") || string.IsNullOrEmpty(_sysCacheService.Get<string>($"WxAccessToken_{_wechatOptions.WechatAppId}")))
         {
             var client = CreateWechatClient();
             var reqCgibinToken = new CgibinTokenRequest();
             var resCgibinToken = await client.ExecuteCgibinTokenAsync(reqCgibinToken);
             if (resCgibinToken.ErrorCode != (int)WechatReturnCodeEnum.请求成功)
                 throw Oops.Oh(resCgibinToken.ErrorMessage + " " + resCgibinToken.ErrorCode);
-            _sysCacheSrv.Set($"WxAccessToken_{_wechatOptions.WechatAppId}", resCgibinToken.AccessToken, TimeSpan.FromSeconds(resCgibinToken.ExpiresIn - 60));
+            _sysCacheService.Set($"WxAccessToken_{_wechatOptions.WechatAppId}", resCgibinToken.AccessToken, TimeSpan.FromSeconds(resCgibinToken.ExpiresIn - 60));
         }
 
-        return _sysCacheSrv.Get<string>($"WxAccessToken_{_wechatOptions.WechatAppId}");
+        return _sysCacheService.Get<string>($"WxAccessToken_{_wechatOptions.WechatAppId}");
     }
 
     /// <summary>
@@ -115,30 +109,25 @@ public partial class WechatApiClientFactory : ISingleton
     /// <returns></returns>
     public async Task<string> TryGetWxOpenAccessTokenAsync()
     {
-        var _sysCacheSrv = App.GetRequiredService<SysCacheService>();
-
-        if (!_sysCacheSrv.ExistKey($"WxAccessToken_{_wechatOptions.WxOpenAppId}") || string.IsNullOrEmpty(_sysCacheSrv.Get<string>($"WxAccessToken_{_wechatOptions.WxOpenAppId}")))
+        if (!_sysCacheService.ExistKey($"WxAccessToken_{_wechatOptions.WxOpenAppId}") || string.IsNullOrEmpty(_sysCacheService.Get<string>($"WxAccessToken_{_wechatOptions.WxOpenAppId}")))
         {
             var client = CreateWxOpenClient();
             var reqCgibinToken = new CgibinTokenRequest();
             var resCgibinToken = await client.ExecuteCgibinTokenAsync(reqCgibinToken);
             if (resCgibinToken.ErrorCode != (int)WechatReturnCodeEnum.请求成功)
                 throw Oops.Oh(resCgibinToken.ErrorMessage + " " + resCgibinToken.ErrorCode);
-            _sysCacheSrv.Set($"WxAccessToken_{_wechatOptions.WxOpenAppId}", resCgibinToken.AccessToken, TimeSpan.FromSeconds(resCgibinToken.ExpiresIn - 60));
+            _sysCacheService.Set($"WxAccessToken_{_wechatOptions.WxOpenAppId}", resCgibinToken.AccessToken, TimeSpan.FromSeconds(resCgibinToken.ExpiresIn - 60));
         }
 
-        return _sysCacheSrv.Get<string>($"WxAccessToken_{_wechatOptions.WxOpenAppId}");
+        return _sysCacheService.Get<string>($"WxAccessToken_{_wechatOptions.WxOpenAppId}");
     }
 
-
     /// <summary>
     /// 检查微信公众号AccessToken
     /// </summary>
     /// <returns></returns>
     public async Task CheckWechatAccessTokenAsync()
     {
-        var _sysCacheSrv = App.GetRequiredService<SysCacheService>();
-
         if (string.IsNullOrEmpty(_wechatOptions.WechatAppId) || string.IsNullOrEmpty(_wechatOptions.WechatAppSecret)) return;
 
         var req = new CgibinOpenApiQuotaGetRequest
@@ -152,7 +141,7 @@ public partial class WechatApiClientFactory : ISingleton
         var originColor = Console.ForegroundColor;
         if (res.ErrorCode != (int)WechatReturnCodeEnum.请求成功)
         {
-            _sysCacheSrv.Remove($"WxAccessToken_{_wechatOptions.WechatAppId}");
+            _sysCacheService.Remove($"WxAccessToken_{_wechatOptions.WechatAppId}");
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine("【" + DateTime.Now + "】" + _wechatOptions.WxOpenAppId + " 微信公众号令牌 无效");
         }
@@ -164,15 +153,12 @@ public partial class WechatApiClientFactory : ISingleton
         Console.ForegroundColor = originColor;
     }
 
-
     /// <summary>
     /// 检查微信小程序AccessToken
     /// </summary>
     /// <returns></returns>
     public async Task CheckWxOpenAccessTokenAsync()
     {
-        var _sysCacheSrv = App.GetRequiredService<SysCacheService>();
-
         if (string.IsNullOrEmpty(_wechatOptions.WxOpenAppId) || string.IsNullOrEmpty(_wechatOptions.WxOpenAppSecret)) return;
 
         var req = new CgibinOpenApiQuotaGetRequest
@@ -186,7 +172,7 @@ public partial class WechatApiClientFactory : ISingleton
         var originColor = Console.ForegroundColor;
         if (res.ErrorCode != (int)WechatReturnCodeEnum.请求成功)
         {
-            _sysCacheSrv.Remove($"WxAccessToken_{_wechatOptions.WxOpenAppId}");
+            _sysCacheService.Remove($"WxAccessToken_{_wechatOptions.WxOpenAppId}");
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine("【" + DateTime.Now + "】" + _wechatOptions.WxOpenAppId + " 微信小程序令牌 无效");
         }

+ 6 - 4
Admin.NET/Admin.NET.Core/Utils/BaseStatusInput.cs

@@ -1,13 +1,15 @@
 // Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-// 
+//
 // 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-// 
+//
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
 
 namespace Admin.NET.Core;
 
-// 设置状态输入参数
-public class BaseStatusInput: BaseIdInput
+/// <summary>
+/// 设置状态输入参数
+/// </summary>
+public class BaseStatusInput : BaseIdInput
 {
     /// <summary>
     /// 状态

+ 5 - 2
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -193,7 +193,10 @@ public class Startup : AppStartup
         // 即时通讯
         services.AddSignalR(options =>
         {
-            options.KeepAliveInterval = TimeSpan.FromSeconds(5);
+            options.EnableDetailedErrors = true;
+            options.KeepAliveInterval = TimeSpan.FromSeconds(15); // 服务器端向客户端ping的间隔
+            options.ClientTimeoutInterval = TimeSpan.FromSeconds(30); // 客户端向服务器端ping的间隔
+            options.MaximumReceiveMessageSize = 1024 * 1014 * 10; // 数据包大小10M,默认最大为32K
         }).AddNewtonsoftJsonProtocol(options => SetNewtonsoftJsonSetting(options.PayloadSerializerSettings));
 
         // 系统日志
@@ -235,7 +238,7 @@ public class Startup : AppStartup
              });
         });
 
-        //注册虚拟文件系统服务
+        // 注册虚拟文件系统服务
         services.AddVirtualFileServer();
     }
 

+ 12 - 21
Web/package.json

@@ -2,24 +2,15 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.11.03",
+	"lastBuildTime": "2024.11.05",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
 	"scripts": {
-		"bootstrap": "pnpm install",
-		"dev": "vite dev",
-		"build": "vite build",
-		"preview": "vite preview",
-		"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,vue,css,scss,less,json,md}\"",
-		"update-pkg": "ncu -u",
-		"cache-verify": "npm cache verify",
-		"clean-lock": "node ./scripts/clean-lock.js",
-		"clean-modules": "node ./scripts/clean-modules.js",
-		"clean-dist": "node ./scripts/clean-dist.js",
-		"clean-node": "pnpm run clean-lock && pnpm run clean-modules && pnpm run clean-dist",
-		"reinstall": "pnpm run clean-node && pnpm run bootstrap",
+		"dev": "vite",
+		"build": "node --max-old-space-size=8192 ./node_modules/vite/bin/vite build",
 		"lint-fix": "eslint --fix src/",
+		"format": "prettier --write .",
 		"build-api": "cd api_build/ && build.bat"
 	},
 	"dependencies": {
@@ -29,7 +20,7 @@
 		"@microsoft/signalr": "^8.0.7",
 		"@vue-office/docx": "^1.6.2",
 		"@vue-office/excel": "^1.7.11",
-		"@vue-office/pdf": "^2.0.7",
+		"@vue-office/pdf": "^2.0.8",
 		"@vueuse/core": "^11.2.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
@@ -42,10 +33,10 @@
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
 		"element-plus": "^2.8.7",
-		"ezuikit-js": "^8.1.1-alpha.2",
+		"ezuikit-js": "^8.1.1-alpha.3",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
-		"json-editor-vue": "^0.16.0",
+		"json-editor-vue": "^0.17.3",
 		"jsplumb": "^2.15.6",
 		"lodash-es": "^4.17.21",
 		"md-editor-v3": "^4.21.2",
@@ -53,7 +44,7 @@
 		"monaco-editor": "^0.52.0",
 		"mqtt": "^4.3.8",
 		"nprogress": "^0.2.0",
-		"pinia": "^2.2.4",
+		"pinia": "^2.2.6",
 		"print-js": "^1.6.0",
 		"push.js": "^1.0.12",
 		"qrcodejs2-fixes": "^0.0.2",
@@ -72,7 +63,7 @@
 		"vue-grid-layout": "3.0.0-beta1",
 		"vue-i18n": "^10.0.4",
 		"vue-json-pretty": "^2.4.0",
-		"vue-plugin-hiprint": "0.0.57-beta31",
+		"vue-plugin-hiprint": "^0.0.58-fix ",
 		"vue-router": "^4.4.5",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
@@ -84,15 +75,15 @@
 		"@types/node": "^20.16.10",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.11.0",
-		"@typescript-eslint/parser": "^8.11.0",
+		"@typescript-eslint/eslint-plugin": "^8.13.0",
+		"@typescript-eslint/parser": "^8.13.0",
 		"@vitejs/plugin-vue": "^5.1.4",
 		"@vitejs/plugin-vue-jsx": "^4.0.1",
 		"@vue/compiler-sfc": "^3.5.12",
 		"code-inspector-plugin": "^0.17.7",
 		"eslint": "^9.14.0",
 		"eslint-plugin-vue": "^9.30.0",
-		"globals": "^15.11.0",
+		"globals": "^15.12.0",
 		"less": "^4.2.0",
 		"prettier": "^3.3.3",
 		"rollup-plugin-visualizer": "^5.12.0",

+ 11 - 11
Web/scripts/clean-lock.js

@@ -1,16 +1,16 @@
 // clean.js
-import fs from "fs";
-import path from "path";
+import fs from 'fs';
+import path from 'path';
 
-const filesToDelete = ["pnpm-lock.yaml", "package-lock.json"];
+const filesToDelete = ['pnpm-lock.yaml', 'package-lock.json'];
 
 // 删除文件
-filesToDelete.forEach(file => {
-  const filePath = path.join(process.cwd(), file);
-  if (fs.existsSync(filePath)) {
-    fs.unlinkSync(filePath);
-    console.log(`Deleted file: ${filePath}`);
-  } else {
-    console.log(`File not found: ${filePath}`);
-  }
+filesToDelete.forEach((file) => {
+	const filePath = path.join(process.cwd(), file);
+	if (fs.existsSync(filePath)) {
+		fs.unlinkSync(filePath);
+		console.log(`Deleted file: ${filePath}`);
+	} else {
+		console.log(`File not found: ${filePath}`);
+	}
 });

Diferenças do arquivo suprimidas por serem muito extensas
+ 233 - 54
Web/src/api-services/apis/sys-file-api.ts


+ 15 - 131
Web/src/api-services/apis/sys-notice-api.ts

@@ -22,11 +22,7 @@ import { AdminResultListSysNotice } from '../models';
 import { AdminResultSqlSugarPagedListSysNotice } from '../models';
 import { AdminResultSqlSugarPagedListSysNoticeUser } from '../models';
 import { DeleteNoticeInput } from '../models';
-import { Filter } from '../models';
-import { FilterLogicEnum } from '../models';
-import { FilterOperatorEnum } from '../models';
 import { NoticeInput } from '../models';
-import { NoticeTypeEnum } from '../models';
 import { PageNoticeInput } from '../models';
 import { UpdateNoticeInput } from '../models';
 /**
@@ -182,25 +178,11 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
         /**
          * 
          * @summary 获取接收的通知公告
-         * @param {string} [title] 标题
-         * @param {NoticeTypeEnum} [type] 类型(1通知 2公告)
-         * @param {number} [page] 当前页码
-         * @param {number} [pageSize] 页码容量
-         * @param {string} [field] 排序字段
-         * @param {string} [order] 排序方向
-         * @param {string} [descStr] 降序排序
-         * @param {Array<string>} [searchFields] 字段名称集合
-         * @param {string} [searchKeyword] 关键字
-         * @param {string} [keyword] 模糊查询关键字
-         * @param {FilterLogicEnum} [filterLogic] 过滤条件
-         * @param {Array<Filter>} [filterFilters] 筛选过滤条件子项
-         * @param {string} [filterField] 字段名称
-         * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
-         * @param {any} [filterValue] 字段值
+         * @param {PageNoticeInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysNoticePageReceivedGet: async (title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array<string>, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array<Filter>, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysNoticePageReceivedPost: async (body?: PageNoticeInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/sysNotice/pageReceived`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -208,7 +190,7 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             if (configuration) {
                 baseOptions = configuration.baseOptions;
             }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -221,65 +203,7 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
                 localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
             }
 
-            if (title !== undefined) {
-                localVarQueryParameter['Title'] = title;
-            }
-
-            if (type !== undefined) {
-                localVarQueryParameter['Type'] = type;
-            }
-
-            if (page !== undefined) {
-                localVarQueryParameter['Page'] = page;
-            }
-
-            if (pageSize !== undefined) {
-                localVarQueryParameter['PageSize'] = pageSize;
-            }
-
-            if (field !== undefined) {
-                localVarQueryParameter['Field'] = field;
-            }
-
-            if (order !== undefined) {
-                localVarQueryParameter['Order'] = order;
-            }
-
-            if (descStr !== undefined) {
-                localVarQueryParameter['DescStr'] = descStr;
-            }
-
-            if (searchFields) {
-                localVarQueryParameter['Search.Fields'] = searchFields;
-            }
-
-            if (searchKeyword !== undefined) {
-                localVarQueryParameter['Search.Keyword'] = searchKeyword;
-            }
-
-            if (keyword !== undefined) {
-                localVarQueryParameter['Keyword'] = keyword;
-            }
-
-            if (filterLogic !== undefined) {
-                localVarQueryParameter['Filter.Logic'] = filterLogic;
-            }
-
-            if (filterFilters) {
-                localVarQueryParameter['Filter.Filters'] = filterFilters;
-            }
-
-            if (filterField !== undefined) {
-                localVarQueryParameter['Filter.Field'] = filterField;
-            }
-
-            if (filterOperator !== undefined) {
-                localVarQueryParameter['Filter.Operator'] = filterOperator;
-            }
-
-            if (filterValue !== undefined) {
-                localVarQueryParameter['Filter.Value'] = filterValue;
-            }
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
 
             const query = new URLSearchParams(localVarUrlObj.search);
             for (const key in localVarQueryParameter) {
@@ -291,6 +215,8 @@ export const SysNoticeApiAxiosParamCreator = function (configuration?: Configura
             localVarUrlObj.search = (new URLSearchParams(query)).toString();
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
 
             return {
                 url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
@@ -538,26 +464,12 @@ export const SysNoticeApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary 获取接收的通知公告
-         * @param {string} [title] 标题
-         * @param {NoticeTypeEnum} [type] 类型(1通知 2公告)
-         * @param {number} [page] 当前页码
-         * @param {number} [pageSize] 页码容量
-         * @param {string} [field] 排序字段
-         * @param {string} [order] 排序方向
-         * @param {string} [descStr] 降序排序
-         * @param {Array<string>} [searchFields] 字段名称集合
-         * @param {string} [searchKeyword] 关键字
-         * @param {string} [keyword] 模糊查询关键字
-         * @param {FilterLogicEnum} [filterLogic] 过滤条件
-         * @param {Array<Filter>} [filterFilters] 筛选过滤条件子项
-         * @param {string} [filterField] 字段名称
-         * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
-         * @param {any} [filterValue] 字段值
+         * @param {PageNoticeInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array<string>, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array<Filter>, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListSysNoticeUser>>> {
-            const localVarAxiosArgs = await SysNoticeApiAxiosParamCreator(configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options);
+        async apiSysNoticePageReceivedPost(body?: PageNoticeInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListSysNoticeUser>>> {
+            const localVarAxiosArgs = await SysNoticeApiAxiosParamCreator(configuration).apiSysNoticePageReceivedPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -660,26 +572,12 @@ export const SysNoticeApiFactory = function (configuration?: Configuration, base
         /**
          * 
          * @summary 获取接收的通知公告
-         * @param {string} [title] 标题
-         * @param {NoticeTypeEnum} [type] 类型(1通知 2公告)
-         * @param {number} [page] 当前页码
-         * @param {number} [pageSize] 页码容量
-         * @param {string} [field] 排序字段
-         * @param {string} [order] 排序方向
-         * @param {string} [descStr] 降序排序
-         * @param {Array<string>} [searchFields] 字段名称集合
-         * @param {string} [searchKeyword] 关键字
-         * @param {string} [keyword] 模糊查询关键字
-         * @param {FilterLogicEnum} [filterLogic] 过滤条件
-         * @param {Array<Filter>} [filterFilters] 筛选过滤条件子项
-         * @param {string} [filterField] 字段名称
-         * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
-         * @param {any} [filterValue] 字段值
+         * @param {PageNoticeInput} [body] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array<string>, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array<Filter>, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListSysNoticeUser>> {
-            return SysNoticeApiFp(configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(axios, basePath));
+        async apiSysNoticePageReceivedPost(body?: PageNoticeInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListSysNoticeUser>> {
+            return SysNoticeApiFp(configuration).apiSysNoticePageReceivedPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -766,27 +664,13 @@ export class SysNoticeApi extends BaseAPI {
     /**
      * 
      * @summary 获取接收的通知公告
-     * @param {string} [title] 标题
-     * @param {NoticeTypeEnum} [type] 类型(1通知 2公告)
-     * @param {number} [page] 当前页码
-     * @param {number} [pageSize] 页码容量
-     * @param {string} [field] 排序字段
-     * @param {string} [order] 排序方向
-     * @param {string} [descStr] 降序排序
-     * @param {Array<string>} [searchFields] 字段名称集合
-     * @param {string} [searchKeyword] 关键字
-     * @param {string} [keyword] 模糊查询关键字
-     * @param {FilterLogicEnum} [filterLogic] 过滤条件
-     * @param {Array<Filter>} [filterFilters] 筛选过滤条件子项
-     * @param {string} [filterField] 字段名称
-     * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
-     * @param {any} [filterValue] 字段值
+     * @param {PageNoticeInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysNoticeApi
      */
-    public async apiSysNoticePageReceivedGet(title?: string, type?: NoticeTypeEnum, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array<string>, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array<Filter>, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListSysNoticeUser>> {
-        return SysNoticeApiFp(this.configuration).apiSysNoticePageReceivedGet(title, type, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysNoticePageReceivedPost(body?: PageNoticeInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListSysNoticeUser>> {
+        return SysNoticeApiFp(this.configuration).apiSysNoticePageReceivedPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

+ 0 - 71
Web/src/api-services/models/admin-result-list-file-output.ts

@@ -1,71 +0,0 @@
-/* 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 { FileOutput } from './file-output';
- /**
- * 全局返回结果
- *
- * @export
- * @interface AdminResultListFileOutput
- */
-export interface AdminResultListFileOutput {
-
-    /**
-     * 状态码
-     *
-     * @type {number}
-     * @memberof AdminResultListFileOutput
-     */
-    code?: number;
-
-    /**
-     * 类型success、warning、error
-     *
-     * @type {string}
-     * @memberof AdminResultListFileOutput
-     */
-    type?: string | null;
-
-    /**
-     * 错误信息
-     *
-     * @type {string}
-     * @memberof AdminResultListFileOutput
-     */
-    message?: string | null;
-
-    /**
-     * 数据
-     *
-     * @type {Array<FileOutput>}
-     * @memberof AdminResultListFileOutput
-     */
-    result?: Array<FileOutput> | null;
-
-    /**
-     * 附加数据
-     *
-     * @type {any}
-     * @memberof AdminResultListFileOutput
-     */
-    extras?: any | null;
-
-    /**
-     * 时间
-     *
-     * @type {Date}
-     * @memberof AdminResultListFileOutput
-     */
-    time?: Date;
-}

+ 2 - 0
Web/src/api-services/models/db-type.ts

@@ -44,6 +44,8 @@ export enum DbType {
     NUMBER_23 = 23,
     NUMBER_24 = 24,
     NUMBER_25 = 25,
+    NUMBER_26 = 26,
+    NUMBER_27 = 27,
     NUMBER_900 = 900
 }
 

+ 0 - 86
Web/src/api-services/models/file-input.ts

@@ -1,86 +0,0 @@
-/* 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 FileInput
- */
-export interface FileInput {
-
-    /**
-     * 主键Id
-     *
-     * @type {number}
-     * @memberof FileInput
-     */
-    id: number;
-
-    /**
-     * 文件名称
-     *
-     * @type {string}
-     * @memberof FileInput
-     */
-    fileName?: string | null;
-
-    /**
-     * 文件类型
-     *
-     * @type {string}
-     * @memberof FileInput
-     */
-    fileType?: string | null;
-
-    /**
-     * 是否公开  若为true则所有人都可以查看,默认只有自己或有权限的可以查看
-     *
-     * @type {boolean}
-     * @memberof FileInput
-     */
-    isPublic?: boolean;
-
-    /**
-     * 文件Url
-     *
-     * @type {string}
-     * @memberof FileInput
-     */
-    url?: string | null;
-
-    /**
-     * 所属实体ID
-     *
-     * @type {number}
-     * @memberof FileInput
-     */
-    belongId?: number;
-
-    /**
-     * 关联对象Id
-     *
-     * @type {number}
-     * @memberof FileInput
-     */
-    relationId?: number;
-
-    /**
-     * 关联对象名称
-     *
-     * @type {string}
-     * @memberof FileInput
-     */
-    relationName?: string | null;
-}

+ 0 - 126
Web/src/api-services/models/file-output.ts

@@ -1,126 +0,0 @@
-/* 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 FileOutput
- */
-export interface FileOutput {
-
-    /**
-     * Id
-     *
-     * @type {number}
-     * @memberof FileOutput
-     */
-    id?: number;
-
-    /**
-     * 名称
-     *
-     * @type {string}
-     * @memberof FileOutput
-     */
-    name?: string | null;
-
-    /**
-     * URL
-     *
-     * @type {string}
-     * @memberof FileOutput
-     */
-    url?: string | null;
-
-    /**
-     * 大小
-     *
-     * @type {number}
-     * @memberof FileOutput
-     */
-    sizeKb?: number;
-
-    /**
-     * 后缀
-     *
-     * @type {string}
-     * @memberof FileOutput
-     */
-    suffix?: string | null;
-
-    /**
-     * 路径
-     *
-     * @type {string}
-     * @memberof FileOutput
-     */
-    filePath?: string | null;
-
-    /**
-     * 文件类别
-     *
-     * @type {string}
-     * @memberof FileOutput
-     */
-    fileType?: string | null;
-
-    /**
-     * 是否公开  若为true则所有人都可以查看,默认只有自己或有权限的可以查看
-     *
-     * @type {boolean}
-     * @memberof FileOutput
-     */
-    isPublic?: boolean;
-
-    /**
-     * 上传人
-     *
-     * @type {string}
-     * @memberof FileOutput
-     */
-    createUserName?: string | null;
-
-    /**
-     * 上传时间
-     *
-     * @type {Date}
-     * @memberof FileOutput
-     */
-    createTime?: Date | null;
-
-    /**
-     * 关联对象名称
-     *
-     * @type {string}
-     * @memberof FileOutput
-     */
-    relationName?: string | null;
-
-    /**
-     * 关联对象Id
-     *
-     * @type {number}
-     * @memberof FileOutput
-     */
-    relationId?: number | null;
-
-    /**
-     * 所属Id
-     *
-     * @type {number}
-     * @memberof FileOutput
-     */
-    belongId?: number | null;
-}

+ 0 - 3
Web/src/api-services/models/index.ts

@@ -38,7 +38,6 @@ export * from './admin-result-list-db-column-output';
 export * from './admin-result-list-db-table-info';
 export * from './admin-result-list-enum-entity';
 export * from './admin-result-list-enum-type-output';
-export * from './admin-result-list-file-output';
 export * from './admin-result-list-int64';
 export * from './admin-result-list-log-vis-output';
 export * from './admin-result-list-menu-output';
@@ -187,8 +186,6 @@ export * from './export-proc-by-tmpinput';
 export * from './export-proc-input';
 export * from './field-attributes';
 export * from './field-info';
-export * from './file-input';
-export * from './file-output';
 export * from './filter';
 export * from './filter-logic-enum';
 export * from './filter-operator-enum';

+ 9 - 1
Web/src/api-services/models/page-file-input.ts

@@ -15,7 +15,7 @@
 import { Filter } from './filter';
 import { Search } from './search';
  /**
- * 
+ * 文件分页查询
  *
  * @export
  * @interface PageFileInput
@@ -90,6 +90,14 @@ export interface PageFileInput {
      */
     fileName?: string | null;
 
+    /**
+     * 文件后缀
+     *
+     * @type {string}
+     * @memberof PageFileInput
+     */
+    suffix?: string | null;
+
     /**
      * 开始时间
      *

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

@@ -12,6 +12,13 @@
  * 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';
  /**
  * 
  *
@@ -29,7 +36,127 @@ export interface SysFileUploadFileBody {
     file: Blob;
 
     /**
-     * 文件类型
+     * 文件路径
+     *
+     * @type {string}
+     * @memberof SysFileUploadFileBody
+     */
+    path?: string;
+
+    /**
+     * 文件保存路径
+     *
+     * @type {string}
+     * @memberof SysFileUploadFileBody
+     */
+    savePath?: string;
+
+    /**
+     * 允许格式:.jpeg.jpg.png.bmp.gif.tif
+     *
+     * @type {string}
+     * @memberof 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
@@ -45,34 +172,1582 @@ export interface 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
      */
-    path?: string;
+    createOrgName: string;
+
+    /**
+     * 编码
+     *
+     * @type {string}
+     * @memberof SysFileUploadFileBody
+     */
+    createOrgCode?: string;
 
     /**
-     * 所属实体ID
+     * 级别
      *
      * @type {number}
      * @memberof SysFileUploadFileBody
      */
-    belongId?: number;
+    createOrgLevel?: number;
 
     /**
-     * 关联对象Id
+     * 机构类型-数据字典
+     *
+     * @type {string}
+     * @memberof SysFileUploadFileBody
+     */
+    createOrgType?: string;
+
+    /**
+     * 负责人Id
      *
      * @type {number}
      * @memberof SysFileUploadFileBody
      */
-    relationId?: number;
+    createOrgDirectorId?: number;
 
     /**
-     * 关联对象名称
+     * 账号
      *
      * @type {string}
      * @memberof SysFileUploadFileBody
      */
-    relationName?: string;
+    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;
 }

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

@@ -13,7 +13,7 @@
  */
 
  /**
- * 
+ * 上传文件Base64
  *
  * @export
  * @interface UploadFileFromBase64Input
@@ -21,23 +21,111 @@
 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
      */
-    fileDataBase64?: string | null;
+    createUserName?: string | null;
 
     /**
-     * 文件类型( \"image/jpeg\",)
+     * 修改者Id
+     *
+     * @type {number}
+     * @memberof UploadFileFromBase64Input
+     */
+    updateUserId?: number | null;
+
+    /**
+     * 修改者姓名
      *
      * @type {string}
      * @memberof UploadFileFromBase64Input
      */
-    contentType?: string | null;
+    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
@@ -45,15 +133,79 @@ export interface UploadFileFromBase64Input {
     fileName?: string | null;
 
     /**
-     * 保存路径
+     * 文件后缀
      *
      * @type {string}
      * @memberof UploadFileFromBase64Input
      */
-    path?: string | null;
+    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
@@ -69,26 +221,26 @@ export interface UploadFileFromBase64Input {
     isPublic?: boolean;
 
     /**
-     * 所属实体ID
+     * 文件内容
      *
-     * @type {number}
+     * @type {string}
      * @memberof UploadFileFromBase64Input
      */
-    belongId?: number;
+    fileDataBase64?: string | null;
 
     /**
-     * 关联对象Id
+     * 文件类型( \"image/jpeg\",)
      *
-     * @type {number}
+     * @type {string}
      * @memberof UploadFileFromBase64Input
      */
-    relationId?: number;
+    contentType?: string | null;
 
     /**
-     * 关联对象名称
+     * 保存路径
      *
      * @type {string}
      * @memberof UploadFileFromBase64Input
      */
-    relationName?: string | null;
+    path?: string | null;
 }

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff