Quellcode durchsuchen

😎1、更新前端请求文件 2、升级依赖

zuohuaijun vor 1 Jahr
Ursprung
Commit
28b6f95f6b
73 geänderte Dateien mit 423 neuen und 591 gelöschten Zeilen
  1. 2 2
      Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
  2. 6 6
      Web/package.json
  3. 4 4
      Web/src/api-services/apis/sys-cache-api.ts
  4. 16 16
      Web/src/api-services/apis/sys-dict-data-api.ts
  5. 83 0
      Web/src/api-services/apis/sys-file-api.ts
  6. 75 0
      Web/src/api-services/apis/sys-job-api.ts
  7. 88 4
      Web/src/api-services/apis/sys-wx-open-api.ts
  8. 1 9
      Web/src/api-services/models/add-config-input.ts
  9. 8 16
      Web/src/api-services/models/add-dict-data-input.ts
  10. 10 12
      Web/src/api-services/models/add-dict-type-input.ts
  11. 0 8
      Web/src/api-services/models/add-menu-input.ts
  12. 0 8
      Web/src/api-services/models/add-notice-input.ts
  13. 0 8
      Web/src/api-services/models/add-open-access-input.ts
  14. 0 8
      Web/src/api-services/models/add-org-input.ts
  15. 0 8
      Web/src/api-services/models/add-plugin-input.ts
  16. 0 8
      Web/src/api-services/models/add-pos-input.ts
  17. 0 8
      Web/src/api-services/models/add-print-input.ts
  18. 0 8
      Web/src/api-services/models/add-role-input.ts
  19. 0 8
      Web/src/api-services/models/add-schedule-input.ts
  20. 0 8
      Web/src/api-services/models/add-template-input.ts
  21. 0 16
      Web/src/api-services/models/add-tenant-input.ts
  22. 3 11
      Web/src/api-services/models/add-user-input.ts
  23. 0 8
      Web/src/api-services/models/add-user-reg-way-input.ts
  24. 1 0
      Web/src/api-services/models/db-type.ts
  25. 1 1
      Web/src/api-services/models/generate-qrimage-input.ts
  26. 14 0
      Web/src/api-services/models/generate-qrimage-output.ts
  27. 52 0
      Web/src/api-services/models/generate-qrimage-un-limit-input.ts
  28. 1 0
      Web/src/api-services/models/index.ts
  29. 1 1
      Web/src/api-services/models/login-input.ts
  30. 0 8
      Web/src/api-services/models/open-access-output.ts
  31. 10 2
      Web/src/api-services/models/page-dict-data-input.ts
  32. 0 8
      Web/src/api-services/models/sys-code-gen-config.ts
  33. 0 8
      Web/src/api-services/models/sys-code-gen.ts
  34. 1 9
      Web/src/api-services/models/sys-config.ts
  35. 8 16
      Web/src/api-services/models/sys-dict-data.ts
  36. 8 10
      Web/src/api-services/models/sys-dict-type.ts
  37. 2 18
      Web/src/api-services/models/sys-file.ts
  38. 0 8
      Web/src/api-services/models/sys-log-diff.ts
  39. 0 8
      Web/src/api-services/models/sys-log-ex.ts
  40. 0 8
      Web/src/api-services/models/sys-log-op.ts
  41. 0 8
      Web/src/api-services/models/sys-log-vis.ts
  42. 0 8
      Web/src/api-services/models/sys-menu.ts
  43. 0 8
      Web/src/api-services/models/sys-notice.ts
  44. 0 8
      Web/src/api-services/models/sys-org.ts
  45. 0 8
      Web/src/api-services/models/sys-plugin.ts
  46. 0 8
      Web/src/api-services/models/sys-pos.ts
  47. 0 8
      Web/src/api-services/models/sys-print.ts
  48. 0 8
      Web/src/api-services/models/sys-role.ts
  49. 0 8
      Web/src/api-services/models/sys-schedule.ts
  50. 0 8
      Web/src/api-services/models/sys-template.ts
  51. 3 11
      Web/src/api-services/models/sys-user.ts
  52. 0 8
      Web/src/api-services/models/sys-wechat-pay.ts
  53. 0 8
      Web/src/api-services/models/sys-wechat-refund.ts
  54. 0 8
      Web/src/api-services/models/sys-wechat-user.ts
  55. 0 16
      Web/src/api-services/models/tenant-output.ts
  56. 1 9
      Web/src/api-services/models/update-config-input.ts
  57. 8 16
      Web/src/api-services/models/update-dict-data-input.ts
  58. 10 12
      Web/src/api-services/models/update-dict-type-input.ts
  59. 0 8
      Web/src/api-services/models/update-menu-input.ts
  60. 0 8
      Web/src/api-services/models/update-notice-input.ts
  61. 0 8
      Web/src/api-services/models/update-open-access-input.ts
  62. 0 8
      Web/src/api-services/models/update-org-input.ts
  63. 0 8
      Web/src/api-services/models/update-plugin-input.ts
  64. 0 8
      Web/src/api-services/models/update-pos-input.ts
  65. 0 8
      Web/src/api-services/models/update-print-input.ts
  66. 0 8
      Web/src/api-services/models/update-role-input.ts
  67. 0 8
      Web/src/api-services/models/update-schedule-input.ts
  68. 0 8
      Web/src/api-services/models/update-template-input.ts
  69. 0 16
      Web/src/api-services/models/update-tenant-input.ts
  70. 3 11
      Web/src/api-services/models/update-user-input.ts
  71. 0 8
      Web/src/api-services/models/update-user-reg-way-input.ts
  72. 3 11
      Web/src/api-services/models/user-output.ts
  73. 0 8
      Web/src/api-services/models/user-reg-way-output.ts

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

@@ -33,7 +33,7 @@
     <PackageReference Include="MailKit" Version="4.11.0" />
     <PackageReference Include="MiniExcel" Version="1.39.0" />
     <PackageReference Include="MiniWord" Version="0.9.2" />
-    <PackageReference Include="NewLife.Redis" Version="6.1.2025.301" />
+    <PackageReference Include="NewLife.Redis" Version="6.1.2025.401" />
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
 	<PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
@@ -46,7 +46,7 @@
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1211" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1213" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />

+ 6 - 6
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.03.30",
+	"lastBuildTime": "2025.04.01",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -75,11 +75,11 @@
 	"devDependencies": {
 		"@plugin-web-update-notification/vite": "^2.0.0",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^22.13.14",
+		"@types/node": "^22.13.15",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.28.0",
-		"@typescript-eslint/parser": "^8.28.0",
+		"@typescript-eslint/eslint-plugin": "^8.29.0",
+		"@typescript-eslint/parser": "^8.29.0",
 		"@vitejs/plugin-vue": "^5.2.3",
 		"@vitejs/plugin-vue-jsx": "^4.1.2",
 		"@vue/compiler-sfc": "^3.5.13",
@@ -90,10 +90,10 @@
 		"less": "^4.2.2",
 		"prettier": "^3.5.3",
 		"rollup-plugin-visualizer": "^5.14.0",
-		"sass": "^1.86.0",
+		"sass": "^1.86.1",
 		"terser": "^5.39.0",
 		"typescript": "^5.8.2",
-		"vite": "^6.2.3",
+		"vite": "^6.2.4",
 		"vite-plugin-cdn-import": "^1.0.1",
 		"vite-plugin-compression2": "^1.3.3",
 		"vite-plugin-vue-setup-extend": "^0.4.0",

+ 4 - 4
Web/src/api-services/apis/sys-cache-api.ts

@@ -29,7 +29,7 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
     return {
         /**
          * 
-         * @summary 申请分布式锁
+         * @summary 申请分布式锁 🔖
          * @param {string} key 要锁定的key
          * @param {number} msTimeout 申请锁等待的时间,单位毫秒
          * @param {number} msExpire 锁过期时间,超过该时间没有主动是放则自动是放,必须整数秒,单位毫秒
@@ -387,7 +387,7 @@ export const SysCacheApiFp = function(configuration?: Configuration) {
     return {
         /**
          * 
-         * @summary 申请分布式锁
+         * @summary 申请分布式锁 🔖
          * @param {string} key 要锁定的key
          * @param {number} msTimeout 申请锁等待的时间,单位毫秒
          * @param {number} msExpire 锁过期时间,超过该时间没有主动是放则自动是放,必须整数秒,单位毫秒
@@ -495,7 +495,7 @@ export const SysCacheApiFactory = function (configuration?: Configuration, baseP
     return {
         /**
          * 
-         * @summary 申请分布式锁
+         * @summary 申请分布式锁 🔖
          * @param {string} key 要锁定的key
          * @param {number} msTimeout 申请锁等待的时间,单位毫秒
          * @param {number} msExpire 锁过期时间,超过该时间没有主动是放则自动是放,必须整数秒,单位毫秒
@@ -576,7 +576,7 @@ export const SysCacheApiFactory = function (configuration?: Configuration, baseP
 export class SysCacheApi extends BaseAPI {
     /**
      * 
-     * @summary 申请分布式锁
+     * @summary 申请分布式锁 🔖
      * @param {string} key 要锁定的key
      * @param {number} msTimeout 申请锁等待的时间,单位毫秒
      * @param {number} msExpire 锁过期时间,超过该时间没有主动是放则自动是放,必须整数秒,单位毫秒

+ 16 - 16
Web/src/api-services/apis/sys-dict-data-api.ts

@@ -132,15 +132,15 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
         /**
          * 
          * @summary 根据查询条件获取字典值集合 🔖
-         * @param {string} code 编码
+         * @param {string} value 字典值
          * @param {number} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysDictDataDataListGet: async (code: string, status?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'code' is not null or undefined
-            if (code === null || code === undefined) {
-                throw new RequiredError('code','Required parameter code was null or undefined when calling apiSysDictDataDataListGet.');
+        apiSysDictDataDataListGet: async (value: string, status?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'value' is not null or undefined
+            if (value === null || value === undefined) {
+                throw new RequiredError('value','Required parameter value was null or undefined when calling apiSysDictDataDataListGet.');
             }
             const localVarPath = `/api/sysDictData/dataList`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
@@ -162,8 +162,8 @@ export const SysDictDataApiAxiosParamCreator = function (configuration?: Configu
                 localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
             }
 
-            if (code !== undefined) {
-                localVarQueryParameter['Code'] = code;
+            if (value !== undefined) {
+                localVarQueryParameter['Value'] = value;
             }
 
             if (status !== undefined) {
@@ -527,13 +527,13 @@ export const SysDictDataApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary 根据查询条件获取字典值集合 🔖
-         * @param {string} code 编码
+         * @param {string} value 字典值
          * @param {number} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDataListGet(code: string, status?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysDictData>>> {
-            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDataListGet(code, status, options);
+        async apiSysDictDataDataListGet(value: string, status?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysDictData>>> {
+            const localVarAxiosArgs = await SysDictDataApiAxiosParamCreator(configuration).apiSysDictDataDataListGet(value, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -656,13 +656,13 @@ export const SysDictDataApiFactory = function (configuration?: Configuration, ba
         /**
          * 
          * @summary 根据查询条件获取字典值集合 🔖
-         * @param {string} code 编码
+         * @param {string} value 字典值
          * @param {number} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysDictDataDataListGet(code: string, status?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysDictData>> {
-            return SysDictDataApiFp(configuration).apiSysDictDataDataListGet(code, status, options).then((request) => request(axios, basePath));
+        async apiSysDictDataDataListGet(value: string, status?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysDictData>> {
+            return SysDictDataApiFp(configuration).apiSysDictDataDataListGet(value, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -760,14 +760,14 @@ export class SysDictDataApi extends BaseAPI {
     /**
      * 
      * @summary 根据查询条件获取字典值集合 🔖
-     * @param {string} code 编码
+     * @param {string} value 字典值
      * @param {number} [status] 状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysDictDataApi
      */
-    public async apiSysDictDataDataListGet(code: string, status?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysDictData>> {
-        return SysDictDataApiFp(this.configuration).apiSysDictDataDataListGet(code, status, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysDictDataDataListGet(value: string, status?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysDictData>> {
+        return SysDictDataApiFp(this.configuration).apiSysDictDataDataListGet(value, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

+ 83 - 0
Web/src/api-services/apis/sys-file-api.ts

@@ -177,6 +177,54 @@ export const SysFileApiAxiosParamCreator = function (configuration?: Configurati
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 根据文件Id集合获取文件 🔖
+         * @param {Array<number>} [ids] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysFileFileByIdsGet: async (ids?: Array<number>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysFile/fileByIds`;
+            // 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: 'GET', ...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;
+            }
+
+            if (ids) {
+                localVarQueryParameter['ids'] = ids;
+            }
+
+            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 获取文件 🔖
@@ -809,6 +857,20 @@ export const SysFileApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 根据文件Id集合获取文件 🔖
+         * @param {Array<number>} [ids] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysFileFileByIdsGet(ids?: Array<number>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysFile>>> {
+            const localVarAxiosArgs = await SysFileApiAxiosParamCreator(configuration).apiSysFileFileByIdsGet(ids, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 获取文件 🔖
@@ -1009,6 +1071,16 @@ export const SysFileApiFactory = function (configuration?: Configuration, basePa
         async apiSysFileDownloadFilePost(body?: SysFile, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultIActionResult>> {
             return SysFileApiFp(configuration).apiSysFileDownloadFilePost(body, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 根据文件Id集合获取文件 🔖
+         * @param {Array<number>} [ids] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysFileFileByIdsGet(ids?: Array<number>, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysFile>> {
+            return SysFileApiFp(configuration).apiSysFileFileByIdsGet(ids, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 获取文件 🔖
@@ -1169,6 +1241,17 @@ export class SysFileApi extends BaseAPI {
     public async apiSysFileDownloadFilePost(body?: SysFile, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultIActionResult>> {
         return SysFileApiFp(this.configuration).apiSysFileDownloadFilePost(body, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 根据文件Id集合获取文件 🔖
+     * @param {Array<number>} [ids] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysFileApi
+     */
+    public async apiSysFileFileByIdsGet(ids?: Array<number>, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysFile>> {
+        return SysFileApiFp(this.configuration).apiSysFileFileByIdsGet(ids, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 获取文件 🔖

+ 75 - 0
Web/src/api-services/apis/sys-job-api.ts

@@ -225,6 +225,49 @@ export const SysJobApiAxiosParamCreator = function (configuration?: Configuratio
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 清空作业触发器运行记录 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysJobClearJobTriggerRecordPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysJob/clearJobTriggerRecord`;
+            // 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 删除作业 ⏰
@@ -1080,6 +1123,19 @@ export const SysJobApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 清空作业触发器运行记录 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysJobClearJobTriggerRecordPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysJobApiAxiosParamCreator(configuration).apiSysJobClearJobTriggerRecordPost(options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 删除作业 ⏰
@@ -1361,6 +1417,15 @@ export const SysJobApiFactory = function (configuration?: Configuration, basePat
         async apiSysJobCancelSleepPost(options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
             return SysJobApiFp(configuration).apiSysJobCancelSleepPost(options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 清空作业触发器运行记录 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysJobClearJobTriggerRecordPost(options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysJobApiFp(configuration).apiSysJobClearJobTriggerRecordPost(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 删除作业 ⏰
@@ -1579,6 +1644,16 @@ export class SysJobApi extends BaseAPI {
     public async apiSysJobCancelSleepPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
         return SysJobApiFp(this.configuration).apiSysJobCancelSleepPost(options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 清空作业触发器运行记录 🔖
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysJobApi
+     */
+    public async apiSysJobClearJobTriggerRecordPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysJobApiFp(this.configuration).apiSysJobClearJobTriggerRecordPost(options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 删除作业 ⏰

+ 88 - 4
Web/src/api-services/apis/sys-wx-open-api.ts

@@ -24,6 +24,7 @@ import { AdminResultSysFile } from '../models';
 import { AdminResultWxOpenIdOutput } from '../models';
 import { AdminResultWxPhoneOutput } from '../models';
 import { GenerateQRImageInput } from '../models';
+import { GenerateQRImageUnLimitInput } from '../models';
 import { SendSubscribeMessageInput } from '../models';
 import { SetNickNameInput } from '../models';
 import { WxOpenIdLoginInput } from '../models';
@@ -83,7 +84,7 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
         },
         /**
          * 
-         * @summary 生成二维码
+         * @summary 生成带参数小程序二维码(总共生成的码数量限制为 100,000)
          * @param {GenerateQRImageInput} [body] 扫码进入的小程序页面路径,最大长度 128 个字符,不能为空; eg: pages / index ? id &#x3D; AY000001
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -129,6 +130,54 @@ export const SysWxOpenApiAxiosParamCreator = function (configuration?: Configura
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 生成二维码(获取不受限制的小程序码)
+         * @param {GenerateQRImageUnLimitInput} [body] 入参
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysWxOpenGenerateQRImageUnlimitPost: async (body?: GenerateQRImageUnLimitInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysWxOpen/generateQRImageUnlimit`;
+            // 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;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            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};
+            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,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 获取订阅消息模板列表 🔖
@@ -570,7 +619,7 @@ export const SysWxOpenApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 生成二维码
+         * @summary 生成带参数小程序二维码(总共生成的码数量限制为 100,000)
          * @param {GenerateQRImageInput} [body] 扫码进入的小程序页面路径,最大长度 128 个字符,不能为空; eg: pages / index ? id &#x3D; AY000001
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -582,6 +631,20 @@ export const SysWxOpenApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 生成二维码(获取不受限制的小程序码)
+         * @param {GenerateQRImageUnLimitInput} [body] 入参
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysWxOpenGenerateQRImageUnlimitPost(body?: GenerateQRImageUnLimitInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultGenerateQRImageOutput>>> {
+            const localVarAxiosArgs = await SysWxOpenApiAxiosParamCreator(configuration).apiSysWxOpenGenerateQRImageUnlimitPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 获取订阅消息模板列表 🔖
@@ -718,7 +781,7 @@ export const SysWxOpenApiFactory = function (configuration?: Configuration, base
         },
         /**
          * 
-         * @summary 生成二维码
+         * @summary 生成带参数小程序二维码(总共生成的码数量限制为 100,000)
          * @param {GenerateQRImageInput} [body] 扫码进入的小程序页面路径,最大长度 128 个字符,不能为空; eg: pages / index ? id &#x3D; AY000001
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -726,6 +789,16 @@ export const SysWxOpenApiFactory = function (configuration?: Configuration, base
         async apiSysWxOpenGenerateQRImagePost(body?: GenerateQRImageInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultGenerateQRImageOutput>> {
             return SysWxOpenApiFp(configuration).apiSysWxOpenGenerateQRImagePost(body, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 生成二维码(获取不受限制的小程序码)
+         * @param {GenerateQRImageUnLimitInput} [body] 入参
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysWxOpenGenerateQRImageUnlimitPost(body?: GenerateQRImageUnLimitInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultGenerateQRImageOutput>> {
+            return SysWxOpenApiFp(configuration).apiSysWxOpenGenerateQRImageUnlimitPost(body, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 获取订阅消息模板列表 🔖
@@ -832,7 +905,7 @@ export class SysWxOpenApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 生成二维码
+     * @summary 生成带参数小程序二维码(总共生成的码数量限制为 100,000)
      * @param {GenerateQRImageInput} [body] 扫码进入的小程序页面路径,最大长度 128 个字符,不能为空; eg: pages / index ? id &#x3D; AY000001
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
@@ -841,6 +914,17 @@ export class SysWxOpenApi extends BaseAPI {
     public async apiSysWxOpenGenerateQRImagePost(body?: GenerateQRImageInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultGenerateQRImageOutput>> {
         return SysWxOpenApiFp(this.configuration).apiSysWxOpenGenerateQRImagePost(body, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 生成二维码(获取不受限制的小程序码)
+     * @param {GenerateQRImageUnLimitInput} [body] 入参
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysWxOpenApi
+     */
+    public async apiSysWxOpenGenerateQRImageUnlimitPost(body?: GenerateQRImageUnLimitInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultGenerateQRImageOutput>> {
+        return SysWxOpenApiFp(this.configuration).apiSysWxOpenGenerateQRImageUnlimitPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 获取订阅消息模板列表 🔖

+ 1 - 9
Web/src/api-services/models/add-config-input.ts

@@ -77,14 +77,6 @@ export interface AddConfigInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddConfigInput
-     */
-    isDelete?: boolean;
-
     /**
      * 名称
      *
@@ -102,7 +94,7 @@ export interface AddConfigInput {
     code?: string | null;
 
     /**
-     * 属性默认
+     * 参数
      *
      * @type {string}
      * @memberof AddConfigInput

+ 8 - 16
Web/src/api-services/models/add-dict-data-input.ts

@@ -77,22 +77,6 @@ export interface AddDictDataInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddDictDataInput
-     */
-    isDelete?: boolean;
-
-    /**
-     * 租户Id
-     *
-     * @type {number}
-     * @memberof AddDictDataInput
-     */
-    tenantId?: number | null;
-
     /**
      * 字典类型Id
      *
@@ -125,6 +109,14 @@ export interface AddDictDataInput {
      */
     code?: string | null;
 
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof AddDictDataInput
+     */
+    name?: string | null;
+
     /**
      * 显示样式-标签颜色
      *

+ 10 - 12
Web/src/api-services/models/add-dict-type-input.ts

@@ -79,14 +79,6 @@ export interface AddDictTypeInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddDictTypeInput
-     */
-    isDelete?: boolean;
-
     /**
      * 名称
      *
@@ -120,16 +112,16 @@ export interface AddDictTypeInput {
     remark?: string | null;
 
     /**
-     * @type {YesNoEnum}
+     * @type {StatusEnum}
      * @memberof AddDictTypeInput
      */
-    sysFlag?: YesNoEnum;
+    status?: StatusEnum;
 
     /**
-     * @type {StatusEnum}
+     * @type {YesNoEnum}
      * @memberof AddDictTypeInput
      */
-    status?: StatusEnum;
+    isTenant?: YesNoEnum;
 
     /**
      * 字典值集合
@@ -138,4 +130,10 @@ export interface AddDictTypeInput {
      * @memberof AddDictTypeInput
      */
     children?: Array<SysDictData> | null;
+
+    /**
+     * @type {YesNoEnum}
+     * @memberof AddDictTypeInput
+     */
+    sysFlag?: YesNoEnum;
 }

+ 0 - 8
Web/src/api-services/models/add-menu-input.ts

@@ -79,14 +79,6 @@ export interface AddMenuInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddMenuInput
-     */
-    isDelete?: boolean;
-
     /**
      * 父Id
      *

+ 0 - 8
Web/src/api-services/models/add-notice-input.ts

@@ -78,14 +78,6 @@ export interface AddNoticeInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddNoticeInput
-     */
-    isDelete?: boolean;
-
     /**
      * 标题
      *

+ 0 - 8
Web/src/api-services/models/add-open-access-input.ts

@@ -77,14 +77,6 @@ export interface AddOpenAccessInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddOpenAccessInput
-     */
-    isDelete?: boolean;
-
     /**
      * 绑定租户Id
      *

+ 0 - 8
Web/src/api-services/models/add-org-input.ts

@@ -78,14 +78,6 @@ export interface AddOrgInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddOrgInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/add-plugin-input.ts

@@ -77,14 +77,6 @@ export interface AddPluginInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddPluginInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/add-pos-input.ts

@@ -78,14 +78,6 @@ export interface AddPosInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddPosInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/add-print-input.ts

@@ -78,14 +78,6 @@ export interface AddPrintInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddPrintInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/add-role-input.ts

@@ -78,14 +78,6 @@ export interface AddRoleInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddRoleInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/add-schedule-input.ts

@@ -77,14 +77,6 @@ export interface AddScheduleInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddScheduleInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/add-template-input.ts

@@ -77,14 +77,6 @@ export interface AddTemplateInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddTemplateInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 16
Web/src/api-services/models/add-tenant-input.ts

@@ -80,22 +80,6 @@ export interface AddTenantInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddTenantInput
-     */
-    isDelete?: boolean;
-
-    /**
-     * 应用Id
-     *
-     * @type {number}
-     * @memberof AddTenantInput
-     */
-    appId?: number | null;
-
     /**
      * 租管用户Id
      *

+ 3 - 11
Web/src/api-services/models/add-user-input.ts

@@ -84,12 +84,12 @@ export interface AddUserInput {
     updateUserName?: string | null;
 
     /**
-     * 软删除
+     * 机构Id
      *
-     * @type {boolean}
+     * @type {number}
      * @memberof AddUserInput
      */
-    isDelete?: boolean;
+    orgId?: number;
 
     /**
      * 租户Id
@@ -273,14 +273,6 @@ export interface AddUserInput {
      */
     accountType?: AccountTypeEnum;
 
-    /**
-     * 直属机构Id
-     *
-     * @type {number}
-     * @memberof AddUserInput
-     */
-    orgId?: number;
-
     /**
      * @type {SysOrg}
      * @memberof AddUserInput

+ 0 - 8
Web/src/api-services/models/add-user-reg-way-input.ts

@@ -77,14 +77,6 @@ export interface AddUserRegWayInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof AddUserRegWayInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

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

@@ -47,6 +47,7 @@ export enum DbType {
     NUMBER_26 = 26,
     NUMBER_27 = 27,
     NUMBER_28 = 28,
+    NUMBER_29 = 29,
     NUMBER_900 = 900
 }
 

+ 1 - 1
Web/src/api-services/models/generate-qrimage-input.ts

@@ -13,7 +13,7 @@
  */
 
  /**
- * 生成带参数小程序二维码
+ * 生成带参数小程序二维码(总共生成的码数量限制为 100,000)
  *
  * @export
  * @interface GenerateQRImageInput

+ 14 - 0
Web/src/api-services/models/generate-qrimage-output.ts

@@ -21,18 +21,32 @@
 export interface GenerateQRImageOutput {
 
     /**
+     * 生成状态
+     *
      * @type {boolean}
      * @memberof GenerateQRImageOutput
      */
     success?: boolean;
 
     /**
+     * 生成图片的绝对路径
+     *
      * @type {string}
      * @memberof GenerateQRImageOutput
      */
     imgPath?: string | null;
 
     /**
+     * 生成图片的相对路径
+     *
+     * @type {string}
+     * @memberof GenerateQRImageOutput
+     */
+    relativeImgPath?: string | null;
+
+    /**
+     * 生成图片的错误信息
+     *
      * @type {string}
      * @memberof GenerateQRImageOutput
      */

+ 52 - 0
Web/src/api-services/models/generate-qrimage-un-limit-input.ts

@@ -0,0 +1,52 @@
+/* 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 GenerateQRImageUnLimitInput
+ */
+export interface GenerateQRImageUnLimitInput {
+
+    /**
+     * 扫码进入的小程序页面路径,最大长度 128 个字符,不能为空; eg: pages/index?id=0001
+     *
+     * @type {string}
+     * @memberof GenerateQRImageUnLimitInput
+     */
+    pagePath?: string | null;
+
+    /**
+     * 文件保存的名称
+     *
+     * @type {string}
+     * @memberof GenerateQRImageUnLimitInput
+     */
+    imageName?: string | null;
+
+    /**
+     * 图片宽度 默认430
+     *
+     * @type {number}
+     * @memberof GenerateQRImageUnLimitInput
+     */
+    width?: number;
+
+    /**
+     * @type {string}
+     * @memberof GenerateQRImageUnLimitInput
+     */
+    scene?: string | null;
+}

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

@@ -209,6 +209,7 @@ export * from './gen-auth-url-input';
 export * from './gender-enum';
 export * from './generate-qrimage-input';
 export * from './generate-qrimage-output';
+export * from './generate-qrimage-un-limit-input';
 export * from './generate-signature-input';
 export * from './generic-parameter-attributes';
 export * from './http-method-enum';

+ 1 - 1
Web/src/api-services/models/login-input.ts

@@ -44,7 +44,7 @@ export interface LoginInput {
      * @type {number}
      * @memberof LoginInput
      */
-    tenantId: number;
+    tenantId?: number | null;
 
     /**
      * 验证码Id

+ 0 - 8
Web/src/api-services/models/open-access-output.ts

@@ -77,14 +77,6 @@ export interface OpenAccessOutput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof OpenAccessOutput
-     */
-    isDelete?: boolean;
-
     /**
      * 身份标识
      *

+ 10 - 2
Web/src/api-services/models/page-dict-data-input.ts

@@ -91,10 +91,18 @@ export interface PageDictDataInput {
     dictTypeId?: number;
 
     /**
-     * 字典文本
+     * 文本
      *
      * @type {string}
      * @memberof PageDictDataInput
      */
-    label?: string | null;
+    lable?: string | null;
+
+    /**
+     * 编码
+     *
+     * @type {string}
+     * @memberof PageDictDataInput
+     */
+    code?: string | null;
 }

+ 0 - 8
Web/src/api-services/models/sys-code-gen-config.ts

@@ -76,14 +76,6 @@ export interface SysCodeGenConfig {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysCodeGenConfig
-     */
-    isDelete?: boolean;
-
     /**
      * 代码生成主表Id
      *

+ 0 - 8
Web/src/api-services/models/sys-code-gen.ts

@@ -77,14 +77,6 @@ export interface SysCodeGen {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysCodeGen
-     */
-    isDelete?: boolean;
-
     /**
      * 作者姓名
      *

+ 1 - 9
Web/src/api-services/models/sys-config.ts

@@ -77,14 +77,6 @@ export interface SysConfig {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysConfig
-     */
-    isDelete?: boolean;
-
     /**
      * 名称
      *
@@ -102,7 +94,7 @@ export interface SysConfig {
     code?: string | null;
 
     /**
-     * 属性默认
+     * 参数
      *
      * @type {string}
      * @memberof SysConfig

+ 8 - 16
Web/src/api-services/models/sys-dict-data.ts

@@ -77,22 +77,6 @@ export interface SysDictData {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysDictData
-     */
-    isDelete?: boolean;
-
-    /**
-     * 租户Id
-     *
-     * @type {number}
-     * @memberof SysDictData
-     */
-    tenantId?: number | null;
-
     /**
      * 字典类型Id
      *
@@ -125,6 +109,14 @@ export interface SysDictData {
      */
     code?: string | null;
 
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof SysDictData
+     */
+    name?: string | null;
+
     /**
      * 显示样式-标签颜色
      *

+ 8 - 10
Web/src/api-services/models/sys-dict-type.ts

@@ -79,14 +79,6 @@ export interface SysDictType {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysDictType
-     */
-    isDelete?: boolean;
-
     /**
      * 名称
      *
@@ -119,6 +111,12 @@ export interface SysDictType {
      */
     remark?: string | null;
 
+    /**
+     * @type {StatusEnum}
+     * @memberof SysDictType
+     */
+    status?: StatusEnum;
+
     /**
      * @type {YesNoEnum}
      * @memberof SysDictType
@@ -126,10 +124,10 @@ export interface SysDictType {
     sysFlag?: YesNoEnum;
 
     /**
-     * @type {StatusEnum}
+     * @type {YesNoEnum}
      * @memberof SysDictType
      */
-    status?: StatusEnum;
+    isTenant?: YesNoEnum;
 
     /**
      * 字典值集合

+ 2 - 18
Web/src/api-services/models/sys-file.ts

@@ -77,28 +77,12 @@ export interface SysFile {
     updateUserName?: string | null;
 
     /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysFile
-     */
-    isDelete?: boolean;
-
-    /**
-     * 创建者部门Id
+     * 机构Id
      *
      * @type {number}
      * @memberof SysFile
      */
-    createOrgId?: number | null;
-
-    /**
-     * 创建者部门名称
-     *
-     * @type {string}
-     * @memberof SysFile
-     */
-    createOrgName?: string | null;
+    orgId?: number;
 
     /**
      * 租户Id

+ 0 - 8
Web/src/api-services/models/sys-log-diff.ts

@@ -76,14 +76,6 @@ export interface SysLogDiff {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysLogDiff
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-log-ex.ts

@@ -77,14 +77,6 @@ export interface SysLogEx {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysLogEx
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-log-op.ts

@@ -77,14 +77,6 @@ export interface SysLogOp {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysLogOp
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-log-vis.ts

@@ -77,14 +77,6 @@ export interface SysLogVis {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysLogVis
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-menu.ts

@@ -79,14 +79,6 @@ export interface SysMenu {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysMenu
-     */
-    isDelete?: boolean;
-
     /**
      * 父Id
      *

+ 0 - 8
Web/src/api-services/models/sys-notice.ts

@@ -78,14 +78,6 @@ export interface SysNotice {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysNotice
-     */
-    isDelete?: boolean;
-
     /**
      * 标题
      *

+ 0 - 8
Web/src/api-services/models/sys-org.ts

@@ -78,14 +78,6 @@ export interface SysOrg {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysOrg
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-plugin.ts

@@ -77,14 +77,6 @@ export interface SysPlugin {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysPlugin
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-pos.ts

@@ -78,14 +78,6 @@ export interface SysPos {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysPos
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-print.ts

@@ -78,14 +78,6 @@ export interface SysPrint {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysPrint
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-role.ts

@@ -78,14 +78,6 @@ export interface SysRole {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysRole
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-schedule.ts

@@ -77,14 +77,6 @@ export interface SysSchedule {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysSchedule
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/sys-template.ts

@@ -77,14 +77,6 @@ export interface SysTemplate {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysTemplate
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 3 - 11
Web/src/api-services/models/sys-user.ts

@@ -83,12 +83,12 @@ export interface SysUser {
     updateUserName?: string | null;
 
     /**
-     * 软删除
+     * 机构Id
      *
-     * @type {boolean}
+     * @type {number}
      * @memberof SysUser
      */
-    isDelete?: boolean;
+    orgId?: number;
 
     /**
      * 租户Id
@@ -288,14 +288,6 @@ export interface SysUser {
      */
     accountType?: AccountTypeEnum;
 
-    /**
-     * 直属机构Id
-     *
-     * @type {number}
-     * @memberof SysUser
-     */
-    orgId?: number;
-
     /**
      * @type {SysOrg}
      * @memberof SysUser

+ 0 - 8
Web/src/api-services/models/sys-wechat-pay.ts

@@ -76,14 +76,6 @@ export interface SysWechatPay {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysWechatPay
-     */
-    isDelete?: boolean;
-
     /**
      * 微信商户号
      *

+ 0 - 8
Web/src/api-services/models/sys-wechat-refund.ts

@@ -76,14 +76,6 @@ export interface SysWechatRefund {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysWechatRefund
-     */
-    isDelete?: boolean;
-
     /**
      * 定单主键
      *

+ 0 - 8
Web/src/api-services/models/sys-wechat-user.ts

@@ -77,14 +77,6 @@ export interface SysWechatUser {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof SysWechatUser
-     */
-    isDelete?: boolean;
-
     /**
      * 系统用户Id
      *

+ 0 - 16
Web/src/api-services/models/tenant-output.ts

@@ -80,22 +80,6 @@ export interface TenantOutput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof TenantOutput
-     */
-    isDelete?: boolean;
-
-    /**
-     * 应用Id
-     *
-     * @type {number}
-     * @memberof TenantOutput
-     */
-    appId?: number | null;
-
     /**
      * 租管用户Id
      *

+ 1 - 9
Web/src/api-services/models/update-config-input.ts

@@ -77,14 +77,6 @@ export interface UpdateConfigInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateConfigInput
-     */
-    isDelete?: boolean;
-
     /**
      * 名称
      *
@@ -102,7 +94,7 @@ export interface UpdateConfigInput {
     code?: string | null;
 
     /**
-     * 属性默认
+     * 参数
      *
      * @type {string}
      * @memberof UpdateConfigInput

+ 8 - 16
Web/src/api-services/models/update-dict-data-input.ts

@@ -77,22 +77,6 @@ export interface UpdateDictDataInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateDictDataInput
-     */
-    isDelete?: boolean;
-
-    /**
-     * 租户Id
-     *
-     * @type {number}
-     * @memberof UpdateDictDataInput
-     */
-    tenantId?: number | null;
-
     /**
      * 字典类型Id
      *
@@ -125,6 +109,14 @@ export interface UpdateDictDataInput {
      */
     code?: string | null;
 
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof UpdateDictDataInput
+     */
+    name?: string | null;
+
     /**
      * 显示样式-标签颜色
      *

+ 10 - 12
Web/src/api-services/models/update-dict-type-input.ts

@@ -79,14 +79,6 @@ export interface UpdateDictTypeInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateDictTypeInput
-     */
-    isDelete?: boolean;
-
     /**
      * 名称
      *
@@ -120,16 +112,16 @@ export interface UpdateDictTypeInput {
     remark?: string | null;
 
     /**
-     * @type {YesNoEnum}
+     * @type {StatusEnum}
      * @memberof UpdateDictTypeInput
      */
-    sysFlag?: YesNoEnum;
+    status?: StatusEnum;
 
     /**
-     * @type {StatusEnum}
+     * @type {YesNoEnum}
      * @memberof UpdateDictTypeInput
      */
-    status?: StatusEnum;
+    isTenant?: YesNoEnum;
 
     /**
      * 字典值集合
@@ -138,4 +130,10 @@ export interface UpdateDictTypeInput {
      * @memberof UpdateDictTypeInput
      */
     children?: Array<SysDictData> | null;
+
+    /**
+     * @type {YesNoEnum}
+     * @memberof UpdateDictTypeInput
+     */
+    sysFlag?: YesNoEnum;
 }

+ 0 - 8
Web/src/api-services/models/update-menu-input.ts

@@ -79,14 +79,6 @@ export interface UpdateMenuInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateMenuInput
-     */
-    isDelete?: boolean;
-
     /**
      * 父Id
      *

+ 0 - 8
Web/src/api-services/models/update-notice-input.ts

@@ -78,14 +78,6 @@ export interface UpdateNoticeInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateNoticeInput
-     */
-    isDelete?: boolean;
-
     /**
      * 标题
      *

+ 0 - 8
Web/src/api-services/models/update-open-access-input.ts

@@ -77,14 +77,6 @@ export interface UpdateOpenAccessInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateOpenAccessInput
-     */
-    isDelete?: boolean;
-
     /**
      * 绑定租户Id
      *

+ 0 - 8
Web/src/api-services/models/update-org-input.ts

@@ -78,14 +78,6 @@ export interface UpdateOrgInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateOrgInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/update-plugin-input.ts

@@ -77,14 +77,6 @@ export interface UpdatePluginInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdatePluginInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/update-pos-input.ts

@@ -78,14 +78,6 @@ export interface UpdatePosInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdatePosInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/update-print-input.ts

@@ -78,14 +78,6 @@ export interface UpdatePrintInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdatePrintInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/update-role-input.ts

@@ -78,14 +78,6 @@ export interface UpdateRoleInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateRoleInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/update-schedule-input.ts

@@ -77,14 +77,6 @@ export interface UpdateScheduleInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateScheduleInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 8
Web/src/api-services/models/update-template-input.ts

@@ -69,14 +69,6 @@ export interface UpdateTemplateInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateTemplateInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 0 - 16
Web/src/api-services/models/update-tenant-input.ts

@@ -80,22 +80,6 @@ export interface UpdateTenantInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateTenantInput
-     */
-    isDelete?: boolean;
-
-    /**
-     * 应用Id
-     *
-     * @type {number}
-     * @memberof UpdateTenantInput
-     */
-    appId?: number | null;
-
     /**
      * 租管用户Id
      *

+ 3 - 11
Web/src/api-services/models/update-user-input.ts

@@ -84,12 +84,12 @@ export interface UpdateUserInput {
     updateUserName?: string | null;
 
     /**
-     * 软删除
+     * 机构Id
      *
-     * @type {boolean}
+     * @type {number}
      * @memberof UpdateUserInput
      */
-    isDelete?: boolean;
+    orgId?: number;
 
     /**
      * 租户Id
@@ -273,14 +273,6 @@ export interface UpdateUserInput {
      */
     accountType?: AccountTypeEnum;
 
-    /**
-     * 直属机构Id
-     *
-     * @type {number}
-     * @memberof UpdateUserInput
-     */
-    orgId?: number;
-
     /**
      * @type {SysOrg}
      * @memberof UpdateUserInput

+ 0 - 8
Web/src/api-services/models/update-user-reg-way-input.ts

@@ -69,14 +69,6 @@ export interface UpdateUserRegWayInput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UpdateUserRegWayInput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *

+ 3 - 11
Web/src/api-services/models/user-output.ts

@@ -83,12 +83,12 @@ export interface UserOutput {
     updateUserName?: string | null;
 
     /**
-     * 软删除
+     * 机构Id
      *
-     * @type {boolean}
+     * @type {number}
      * @memberof UserOutput
      */
-    isDelete?: boolean;
+    orgId?: number;
 
     /**
      * 租户Id
@@ -288,14 +288,6 @@ export interface UserOutput {
      */
     accountType?: AccountTypeEnum;
 
-    /**
-     * 直属机构Id
-     *
-     * @type {number}
-     * @memberof UserOutput
-     */
-    orgId?: number;
-
     /**
      * @type {SysOrg}
      * @memberof UserOutput

+ 0 - 8
Web/src/api-services/models/user-reg-way-output.ts

@@ -77,14 +77,6 @@ export interface UserRegWayOutput {
      */
     updateUserName?: string | null;
 
-    /**
-     * 软删除
-     *
-     * @type {boolean}
-     * @memberof UserRegWayOutput
-     */
-    isDelete?: boolean;
-
     /**
      * 租户Id
      *