增加缓存数据管理页面

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.6.7" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.6.7" />
-    <PackageReference Include="Furion.Pure" Version="4.6.7" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.6.8" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.6.8" />
+    <PackageReference Include="Furion.Pure" Version="4.6.8" />
     <PackageReference Include="Lazy.Captcha.Core" Version="1.1.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.8" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.6.8" />

Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -92,8 +92,8 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=252885263002360, Pid=252885263002300, Title="系统监控", Path="/platform/server", Name="sysServer", Component="/system/server/index", Icon="ele-Monitor", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=150 },
 
             new SysMenu{ Id=252885263002370, Pid=252885263002300, Title="缓存管理", Path="/platform/cache", Name="sysCache", Component="/system/cache/index", Icon="ele-Loading", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=160 },
-            new SysMenu{ Id=252885263002371, Pid=252885263002370, Title="缓存查询", Permission="cache:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263002372, Pid=252885263002370, Title="缓存删除", Permission="cache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
+            new SysMenu{ Id=252885263002371, Pid=252885263002370, Title="缓存查询", Permission="sysCache:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
+            new SysMenu{ Id=252885263002372, Pid=252885263002370, Title="缓存删除", Permission="sysCache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
 
             new SysMenu{ Id=252885263002390, Pid=252885263002300, Title="文件管理", Path="/platform/file", Name="sysFile", Component="/system/file/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=180 },
             new SysMenu{ Id=252885263002391, Pid=252885263002390, Title="文件查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },

Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs

@@ -67,7 +67,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     /// </summary>
     /// <param name="key"></param>
     /// <returns></returns>
-    [HttpGet("/sysCache/remove")]
+    [HttpPost("/sysCache/remove")]
     public void Remove(string key)
     {
         _cache.Remove(key);
@@ -89,7 +89,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     /// </summary>
     /// <param name="prefixKey">键名前缀</param>
     /// <returns></returns>
-    [HttpGet("/sysCache/delByParentKey")]
+    [HttpPost("/sysCache/delByParentKey")]
     public int RemoveByPrefixKey(string prefixKey)
     {
         var delKeys = _cache.Keys.Where(u => u.StartsWith(prefixKey)).ToArray();

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -213,7 +213,7 @@ public static class SqlSugarSetup
     private static void SetDeletedEntityFilter(SqlSugarScopeProvider db)
     {
         // 配置实体假删除缓存
-        var cacheKey = $"DB:{db.CurrentConnectionConfig.ConfigId}:FAKEDELETE";
+        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:IsDelete";
         var tableFilterItemList = db.DataCache.Get<List<TableFilterItem<object>>>(cacheKey);
         if (tableFilterItemList == null)
         {
@@ -256,7 +256,7 @@ public static class SqlSugarSetup
         if (string.IsNullOrWhiteSpace(tenantId)) return;
 
         // 配置租户缓存
-        var cacheKey = $"DB:{db.CurrentConnectionConfig.ConfigId}:TENANTID:{tenantId}";
+        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:TenantId:{tenantId}";
         var tableFilterItemList = db.DataCache.Get<List<TableFilterItem<object>>>(cacheKey);
         if (tableFilterItemList == null)
         {
@@ -299,7 +299,7 @@ public static class SqlSugarSetup
         if (string.IsNullOrWhiteSpace(userId)) return;
 
         // 配置用户机构范围缓存
-        var cacheKey = $"DB:{db.CurrentConnectionConfig.ConfigId}:USERID:{userId}";
+        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:UserId:{userId}";
         var tableFilterItemList = db.DataCache.Get<List<TableFilterItem<object>>>(cacheKey);
         if (tableFilterItemList == null)
         {
@@ -347,7 +347,7 @@ public static class SqlSugarSetup
             return;
 
         // 配置用户机构范围缓存
-        var cacheKey = $"DB:{db.CurrentConnectionConfig.ConfigId}:CUSTOM";
+        var cacheKey = $"db:{db.CurrentConnectionConfig.ConfigId}:Custom";
         var tableFilterItemList = db.DataCache.Get<List<TableFilterItem<object>>>(cacheKey);
         if (tableFilterItemList == null)
         {

Web/package.json

@@ -35,7 +35,8 @@
 		"vue-clipboard3": "^2.0.0",
 		"vue-grid-layout": "^3.0.0-beta1",
 		"vue-i18n": "^9.2.2",
-		"vue-router": "^4.1.2"
+		"vue-router": "^4.1.2",
+		"vue-json-pretty": "^2.2.2"
 	},
 	"devDependencies": {
 		"@types/node": "^18.0.6",

Web/src/api-services/api.ts

@@ -17,7 +17,6 @@ export * from './apis/sys-code-gen-config-api';
 export * from './apis/sys-config-api';
 export * from './apis/sys-const-api';
 export * from './apis/sys-data-base-api';
-export * from './apis/sys-data-resource-api';
 export * from './apis/sys-dict-data-api';
 export * from './apis/sys-dict-type-api';
 export * from './apis/sys-file-api';

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

@@ -130,7 +130,7 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysCacheDelByParentKeyGet: async (prefixKey?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysCacheDelByParentKeyPost: async (prefixKey?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/sysCache/delByParentKey`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -138,7 +138,7 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
             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;
 
@@ -248,7 +248,7 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysCacheRemoveGet: async (key?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysCacheRemovePost: async (key?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/sysCache/remove`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -256,7 +256,7 @@ export const SysCacheApiAxiosParamCreator = function (configuration?: Configurat
             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;
 
@@ -329,8 +329,8 @@ export const SysCacheApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysCacheDelByParentKeyGet(prefixKey?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultInt32>>> {
-            const localVarAxiosArgs = await SysCacheApiAxiosParamCreator(configuration).sysCacheDelByParentKeyGet(prefixKey, options);
+        async sysCacheDelByParentKeyPost(prefixKey?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultInt32>>> {
+            const localVarAxiosArgs = await SysCacheApiAxiosParamCreator(configuration).sysCacheDelByParentKeyPost(prefixKey, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -370,8 +370,8 @@ export const SysCacheApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysCacheRemoveGet(key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysCacheApiAxiosParamCreator(configuration).sysCacheRemoveGet(key, options);
+        async sysCacheRemovePost(key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysCacheApiAxiosParamCreator(configuration).sysCacheRemovePost(key, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -416,8 +416,8 @@ export const SysCacheApiFactory = function (configuration?: Configuration, baseP
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysCacheDelByParentKeyGet(prefixKey?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt32>> {
-            return SysCacheApiFp(configuration).sysCacheDelByParentKeyGet(prefixKey, options).then((request) => request(axios, basePath));
+        async sysCacheDelByParentKeyPost(prefixKey?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt32>> {
+            return SysCacheApiFp(configuration).sysCacheDelByParentKeyPost(prefixKey, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -445,8 +445,8 @@ export const SysCacheApiFactory = function (configuration?: Configuration, baseP
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysCacheRemoveGet(key?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysCacheApiFp(configuration).sysCacheRemoveGet(key, options).then((request) => request(axios, basePath));
+        async sysCacheRemovePost(key?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysCacheApiFp(configuration).sysCacheRemovePost(key, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -491,8 +491,8 @@ export class SysCacheApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCacheApi
      */
-    public async sysCacheDelByParentKeyGet(prefixKey?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt32>> {
-        return SysCacheApiFp(this.configuration).sysCacheDelByParentKeyGet(prefixKey, options).then((request) => request(this.axios, this.basePath));
+    public async sysCacheDelByParentKeyPost(prefixKey?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt32>> {
+        return SysCacheApiFp(this.configuration).sysCacheDelByParentKeyPost(prefixKey, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -523,7 +523,7 @@ export class SysCacheApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCacheApi
      */
-    public async sysCacheRemoveGet(key?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysCacheApiFp(this.configuration).sysCacheRemoveGet(key, options).then((request) => request(this.axios, this.basePath));
+    public async sysCacheRemovePost(key?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysCacheApiFp(this.configuration).sysCacheRemovePost(key, options).then((request) => request(this.axios, this.basePath));
     }
 }

Web/src/api-services/apis/sys-data-resource-api.ts

@@ -1,514 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * 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 globalAxios, { AxiosResponse, AxiosInstance, AxiosRequestConfig } from 'axios';
-import { Configuration } from '../configuration';
-// Some imports not used depending on template conditions
-// @ts-ignore
-import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
-import { AddDataResourceInput } from '../models';
-import { AdminResultInt64 } from '../models';
-import { AdminResultListSysDataResource } from '../models';
-import { DeleteDataResourceInput } from '../models';
-import { UpdateDataResourceInput } from '../models';
-/**
- * SysDataResourceApi - axios parameter creator
- * @export
- */
-export const SysDataResourceApiAxiosParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * 
-         * @summary 增加数据资源
-         * @param {AddDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        sysDataResourceAddPost: async (body?: AddDataResourceInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sysDataResource/add`;
-            // 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
-
-            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 删除数据资源
-         * @param {DeleteDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        sysDataResourceDeletePost: async (body?: DeleteDataResourceInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sysDataResource/delete`;
-            // 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
-
-            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 获取数据资源列表
-         * @param {number} id 主键Id
-         * @param {number} [pid] 父Id
-         * @param {string} [name] 名称
-         * @param {string} [value] 值
-         * @param {string} [code] 编码
-         * @param {number} [order] 排序
-         * @param {string} [remark] 备注
-         * @param {number} [status] 状态
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        sysDataResourceListGet: async (id: number, pid?: number, name?: string, value?: string, code?: string, order?: number, remark?: string, status?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            if (id === null || id === undefined) {
-                throw new RequiredError('id','Required parameter id was null or undefined when calling sysDataResourceListGet.');
-            }
-            const localVarPath = `/sysDataResource/list`;
-            // 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
-
-            if (pid !== undefined) {
-                localVarQueryParameter['Pid'] = pid;
-            }
-
-            if (name !== undefined) {
-                localVarQueryParameter['Name'] = name;
-            }
-
-            if (value !== undefined) {
-                localVarQueryParameter['Value'] = value;
-            }
-
-            if (code !== undefined) {
-                localVarQueryParameter['Code'] = code;
-            }
-
-            if (order !== undefined) {
-                localVarQueryParameter['Order'] = order;
-            }
-
-            if (remark !== undefined) {
-                localVarQueryParameter['Remark'] = remark;
-            }
-
-            if (status !== undefined) {
-                localVarQueryParameter['Status'] = status;
-            }
-
-            if (id !== undefined) {
-                localVarQueryParameter['Id'] = id;
-            }
-
-            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 获取数据资源树结构列表
-         * @param {string} [rootValue] 根节点值
-         * @param {string} [childName] 对应根节点下的名称
-         * @param {boolean} [isContainSelf] 是否包含自己,默认不包含
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        sysDataResourceTreeGet: async (rootValue?: string, childName?: string, isContainSelf?: boolean, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sysDataResource/tree`;
-            // 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
-
-            if (rootValue !== undefined) {
-                localVarQueryParameter['RootValue'] = rootValue;
-            }
-
-            if (childName !== undefined) {
-                localVarQueryParameter['ChildName'] = childName;
-            }
-
-            if (isContainSelf !== undefined) {
-                localVarQueryParameter['IsContainSelf'] = isContainSelf;
-            }
-
-            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 更新数据资源
-         * @param {UpdateDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        sysDataResourceUpdatePost: async (body?: UpdateDataResourceInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sysDataResource/update`;
-            // 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
-
-            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,
-            };
-        },
-    }
-};
-
-/**
- * SysDataResourceApi - functional programming interface
- * @export
- */
-export const SysDataResourceApiFp = function(configuration?: Configuration) {
-    return {
-        /**
-         * 
-         * @summary 增加数据资源
-         * @param {AddDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceAddPost(body?: AddDataResourceInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultInt64>>> {
-            const localVarAxiosArgs = await SysDataResourceApiAxiosParamCreator(configuration).sysDataResourceAddPost(body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
-         * @summary 删除数据资源
-         * @param {DeleteDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceDeletePost(body?: DeleteDataResourceInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysDataResourceApiAxiosParamCreator(configuration).sysDataResourceDeletePost(body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
-         * @summary 获取数据资源列表
-         * @param {number} id 主键Id
-         * @param {number} [pid] 父Id
-         * @param {string} [name] 名称
-         * @param {string} [value] 值
-         * @param {string} [code] 编码
-         * @param {number} [order] 排序
-         * @param {string} [remark] 备注
-         * @param {number} [status] 状态
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceListGet(id: number, pid?: number, name?: string, value?: string, code?: string, order?: number, remark?: string, status?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysDataResource>>> {
-            const localVarAxiosArgs = await SysDataResourceApiAxiosParamCreator(configuration).sysDataResourceListGet(id, pid, name, value, code, order, remark, status, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
-         * @summary 获取数据资源树结构列表
-         * @param {string} [rootValue] 根节点值
-         * @param {string} [childName] 对应根节点下的名称
-         * @param {boolean} [isContainSelf] 是否包含自己,默认不包含
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceTreeGet(rootValue?: string, childName?: string, isContainSelf?: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysDataResource>>> {
-            const localVarAxiosArgs = await SysDataResourceApiAxiosParamCreator(configuration).sysDataResourceTreeGet(rootValue, childName, isContainSelf, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-        /**
-         * 
-         * @summary 更新数据资源
-         * @param {UpdateDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceUpdatePost(body?: UpdateDataResourceInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await SysDataResourceApiAxiosParamCreator(configuration).sysDataResourceUpdatePost(body, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
-    }
-};
-
-/**
- * SysDataResourceApi - factory interface
- * @export
- */
-export const SysDataResourceApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    return {
-        /**
-         * 
-         * @summary 增加数据资源
-         * @param {AddDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceAddPost(body?: AddDataResourceInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt64>> {
-            return SysDataResourceApiFp(configuration).sysDataResourceAddPost(body, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 删除数据资源
-         * @param {DeleteDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceDeletePost(body?: DeleteDataResourceInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysDataResourceApiFp(configuration).sysDataResourceDeletePost(body, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 获取数据资源列表
-         * @param {number} id 主键Id
-         * @param {number} [pid] 父Id
-         * @param {string} [name] 名称
-         * @param {string} [value] 值
-         * @param {string} [code] 编码
-         * @param {number} [order] 排序
-         * @param {string} [remark] 备注
-         * @param {number} [status] 状态
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceListGet(id: number, pid?: number, name?: string, value?: string, code?: string, order?: number, remark?: string, status?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysDataResource>> {
-            return SysDataResourceApiFp(configuration).sysDataResourceListGet(id, pid, name, value, code, order, remark, status, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 获取数据资源树结构列表
-         * @param {string} [rootValue] 根节点值
-         * @param {string} [childName] 对应根节点下的名称
-         * @param {boolean} [isContainSelf] 是否包含自己,默认不包含
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceTreeGet(rootValue?: string, childName?: string, isContainSelf?: boolean, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysDataResource>> {
-            return SysDataResourceApiFp(configuration).sysDataResourceTreeGet(rootValue, childName, isContainSelf, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary 更新数据资源
-         * @param {UpdateDataResourceInput} [body] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysDataResourceUpdatePost(body?: UpdateDataResourceInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return SysDataResourceApiFp(configuration).sysDataResourceUpdatePost(body, options).then((request) => request(axios, basePath));
-        },
-    };
-};
-
-/**
- * SysDataResourceApi - object-oriented interface
- * @export
- * @class SysDataResourceApi
- * @extends {BaseAPI}
- */
-export class SysDataResourceApi extends BaseAPI {
-    /**
-     * 
-     * @summary 增加数据资源
-     * @param {AddDataResourceInput} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysDataResourceApi
-     */
-    public async sysDataResourceAddPost(body?: AddDataResourceInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt64>> {
-        return SysDataResourceApiFp(this.configuration).sysDataResourceAddPost(body, options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
-     * @summary 删除数据资源
-     * @param {DeleteDataResourceInput} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysDataResourceApi
-     */
-    public async sysDataResourceDeletePost(body?: DeleteDataResourceInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysDataResourceApiFp(this.configuration).sysDataResourceDeletePost(body, options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
-     * @summary 获取数据资源列表
-     * @param {number} id 主键Id
-     * @param {number} [pid] 父Id
-     * @param {string} [name] 名称
-     * @param {string} [value] 值
-     * @param {string} [code] 编码
-     * @param {number} [order] 排序
-     * @param {string} [remark] 备注
-     * @param {number} [status] 状态
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysDataResourceApi
-     */
-    public async sysDataResourceListGet(id: number, pid?: number, name?: string, value?: string, code?: string, order?: number, remark?: string, status?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysDataResource>> {
-        return SysDataResourceApiFp(this.configuration).sysDataResourceListGet(id, pid, name, value, code, order, remark, status, options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
-     * @summary 获取数据资源树结构列表
-     * @param {string} [rootValue] 根节点值
-     * @param {string} [childName] 对应根节点下的名称
-     * @param {boolean} [isContainSelf] 是否包含自己,默认不包含
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysDataResourceApi
-     */
-    public async sysDataResourceTreeGet(rootValue?: string, childName?: string, isContainSelf?: boolean, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysDataResource>> {
-        return SysDataResourceApiFp(this.configuration).sysDataResourceTreeGet(rootValue, childName, isContainSelf, options).then((request) => request(this.axios, this.basePath));
-    }
-    /**
-     * 
-     * @summary 更新数据资源
-     * @param {UpdateDataResourceInput} [body] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysDataResourceApi
-     */
-    public async sysDataResourceUpdatePost(body?: UpdateDataResourceInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return SysDataResourceApiFp(this.configuration).sysDataResourceUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
-    }
-}

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

@@ -236,18 +236,18 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单树(Antd)
+         * @summary 根据角色Id获取菜单集合(Element)
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysRoleOwnMenuGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysRoleOwnMenuListGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
             if (id === null || id === undefined) {
-                throw new RequiredError('id','Required parameter id was null or undefined when calling sysRoleOwnMenuGet.');
+                throw new RequiredError('id','Required parameter id was null or undefined when calling sysRoleOwnMenuListGet.');
             }
-            const localVarPath = `/sysRole/ownMenu`;
+            const localVarPath = `/sysRole/ownMenuList`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -286,18 +286,18 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单集合(Element)
+         * @summary 根据角色Id获取菜单树(Antd)
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysRoleOwnMenuListGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysRoleOwnMenuTreeGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
             if (id === null || id === undefined) {
-                throw new RequiredError('id','Required parameter id was null or undefined when calling sysRoleOwnMenuListGet.');
+                throw new RequiredError('id','Required parameter id was null or undefined when calling sysRoleOwnMenuTreeGet.');
             }
-            const localVarPath = `/sysRole/ownMenuList`;
+            const localVarPath = `/sysRole/ownMenuTree`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -617,14 +617,14 @@ export const SysRoleApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单树(Antd)
+         * @summary 根据角色Id获取菜单集合(Element)
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysRoleOwnMenuGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysMenu>>> {
-            const localVarAxiosArgs = await SysRoleApiAxiosParamCreator(configuration).sysRoleOwnMenuGet(id, status, options);
+        async sysRoleOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListInt64>>> {
+            const localVarAxiosArgs = await SysRoleApiAxiosParamCreator(configuration).sysRoleOwnMenuListGet(id, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -632,14 +632,14 @@ export const SysRoleApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单集合(Element)
+         * @summary 根据角色Id获取菜单树(Antd)
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysRoleOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListInt64>>> {
-            const localVarAxiosArgs = await SysRoleApiAxiosParamCreator(configuration).sysRoleOwnMenuListGet(id, status, options);
+        async sysRoleOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysMenu>>> {
+            const localVarAxiosArgs = await SysRoleApiAxiosParamCreator(configuration).sysRoleOwnMenuTreeGet(id, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -768,25 +768,25 @@ export const SysRoleApiFactory = function (configuration?: Configuration, basePa
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单树(Antd)
+         * @summary 根据角色Id获取菜单集合(Element)
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysRoleOwnMenuGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysMenu>> {
-            return SysRoleApiFp(configuration).sysRoleOwnMenuGet(id, status, options).then((request) => request(axios, basePath));
+        async sysRoleOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
+            return SysRoleApiFp(configuration).sysRoleOwnMenuListGet(id, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @summary 根据角色Id获取菜单集合(Element)
+         * @summary 根据角色Id获取菜单树(Antd)
          * @param {number} id 主键Id
          * @param {StatusEnum} [status] 状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysRoleOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
-            return SysRoleApiFp(configuration).sysRoleOwnMenuListGet(id, status, options).then((request) => request(axios, basePath));
+        async sysRoleOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysMenu>> {
+            return SysRoleApiFp(configuration).sysRoleOwnMenuTreeGet(id, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -901,27 +901,27 @@ export class SysRoleApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 根据角色Id获取菜单树(Antd)
+     * @summary 根据角色Id获取菜单集合(Element)
      * @param {number} id 主键Id
      * @param {StatusEnum} [status] 状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysRoleApi
      */
-    public async sysRoleOwnMenuGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysMenu>> {
-        return SysRoleApiFp(this.configuration).sysRoleOwnMenuGet(id, status, options).then((request) => request(this.axios, this.basePath));
+    public async sysRoleOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
+        return SysRoleApiFp(this.configuration).sysRoleOwnMenuListGet(id, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
-     * @summary 根据角色Id获取菜单集合(Element)
+     * @summary 根据角色Id获取菜单树(Antd)
      * @param {number} id 主键Id
      * @param {StatusEnum} [status] 状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysRoleApi
      */
-    public async sysRoleOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
-        return SysRoleApiFp(this.configuration).sysRoleOwnMenuListGet(id, status, options).then((request) => request(this.axios, this.basePath));
+    public async sysRoleOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysMenu>> {
+        return SysRoleApiFp(this.configuration).sysRoleOwnMenuTreeGet(id, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

Web/src/api-services/models/add-data-resource-input.ts

@@ -1,68 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * 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 AddDataResourceInput
- */
-export interface AddDataResourceInput {
-    /**
-     * 主键Id
-     * @type {number}
-     * @memberof AddDataResourceInput
-     */
-    id: number;
-    /**
-     * 父Id
-     * @type {number}
-     * @memberof AddDataResourceInput
-     */
-    pid?: number;
-    /**
-     * 值
-     * @type {string}
-     * @memberof AddDataResourceInput
-     */
-    value?: string | null;
-    /**
-     * 编码
-     * @type {string}
-     * @memberof AddDataResourceInput
-     */
-    code?: string | null;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof AddDataResourceInput
-     */
-    order?: number;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof AddDataResourceInput
-     */
-    remark?: string | null;
-    /**
-     * 状态
-     * @type {number}
-     * @memberof AddDataResourceInput
-     */
-    status?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof AddDataResourceInput
-     */
-    name: string;
-}

Web/src/api-services/models/admin-result-boolean.ts

@@ -48,9 +48,9 @@ export interface AdminResultBoolean {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultBoolean
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-file-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultFileOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultFileOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-iaction-result.ts

@@ -49,9 +49,9 @@ export interface AdminResultIActionResult {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultIActionResult
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-int32.ts

@@ -48,9 +48,9 @@ export interface AdminResultInt32 {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultInt32
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-int64.ts

@@ -48,9 +48,9 @@ export interface AdminResultInt64 {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultInt64
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-code-gen-config.ts

@@ -49,9 +49,9 @@ export interface AdminResultListCodeGenConfig {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListCodeGenConfig
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-database-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultListDatabaseOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListDatabaseOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-db-column-info-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultListDbColumnInfoOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListDbColumnInfoOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-db-table-info.ts

@@ -49,9 +49,9 @@ export interface AdminResultListDbTableInfo {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListDbTableInfo
      */
-    timestamp?: number;
+    time?: Date;
 }

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

@@ -49,9 +49,9 @@ export interface AdminResultListFileOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListFileOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-int64.ts

@@ -48,9 +48,9 @@ export interface AdminResultListInt64 {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListInt64
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-menu-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultListMenuOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListMenuOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-role-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultListRoleOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListRoleOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-selector-dto.ts

@@ -49,9 +49,9 @@ export interface AdminResultListSelectorDto {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListSelectorDto
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-string.ts

@@ -48,9 +48,9 @@ export interface AdminResultListString {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListString
      */
-    timestamp?: number;
+    time?: Date;
 }

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

@@ -49,9 +49,9 @@ export interface AdminResultListSysConfig {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListSysConfig
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-sys-data-resource.ts

@@ -1,57 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * 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 { SysDataResource } from './sys-data-resource';
-/**
- * 全局返回结果
- * @export
- * @interface AdminResultListSysDataResource
- */
-export interface AdminResultListSysDataResource {
-    /**
-     * 状态码
-     * @type {number}
-     * @memberof AdminResultListSysDataResource
-     */
-    code?: number;
-    /**
-     * 类型success、warning、error
-     * @type {string}
-     * @memberof AdminResultListSysDataResource
-     */
-    type?: string | null;
-    /**
-     * 错误信息
-     * @type {string}
-     * @memberof AdminResultListSysDataResource
-     */
-    message?: string | null;
-    /**
-     * 数据
-     * @type {Array<SysDataResource>}
-     * @memberof AdminResultListSysDataResource
-     */
-    result?: Array<SysDataResource> | null;
-    /**
-     * 附加数据
-     * @type {any}
-     * @memberof AdminResultListSysDataResource
-     */
-    extras?: any | null;
-    /**
-     * 时间戳
-     * @type {number}
-     * @memberof AdminResultListSysDataResource
-     */
-    timestamp?: number;
-}

Web/src/api-services/models/admin-result-list-sys-dict-data.ts

@@ -49,9 +49,9 @@ export interface AdminResultListSysDictData {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListSysDictData
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-sys-dict-type.ts

@@ -49,9 +49,9 @@ export interface AdminResultListSysDictType {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListSysDictType
      */
-    timestamp?: number;
+    time?: Date;
 }

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

@@ -49,9 +49,9 @@ export interface AdminResultListSysFile {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListSysFile
      */
-    timestamp?: number;
+    time?: Date;
 }

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

@@ -49,9 +49,9 @@ export interface AdminResultListSysMenu {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListSysMenu
      */
-    timestamp?: number;
+    time?: Date;
 }

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

@@ -49,9 +49,9 @@ export interface AdminResultListSysOrg {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListSysOrg
      */
-    timestamp?: number;
+    time?: Date;
 }

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

@@ -49,9 +49,9 @@ export interface AdminResultListSysPos {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListSysPos
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-table-column-ouput.ts

@@ -49,9 +49,9 @@ export interface AdminResultListTableColumnOuput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListTableColumnOuput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-list-table-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultListTableOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultListTableOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-login-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultLoginOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultLoginOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-login-user-info-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultLoginUserInfoOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultLoginUserInfoOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-notice-detail-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultNoticeDetailOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultNoticeDetailOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-object.ts

@@ -48,9 +48,9 @@ export interface AdminResultObject {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultObject
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-code-gen.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysCodeGen {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysCodeGen
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-config.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysConfig {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysConfig
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-dict-data.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysDictData {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysDictData
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-dict-type.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysDictType {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysDictType
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-file.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysFile {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysFile
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-log-diff.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysLogDiff {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysLogDiff
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-log-ex.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysLogEx {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysLogEx
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-log-op.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysLogOp {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysLogOp
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-log-vis.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysLogVis {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysLogVis
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-role.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysRole {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysRole
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-sys-user.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListSysUser {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListSysUser
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sql-sugar-paged-list-timer-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultSqlSugarPagedListTimerOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSqlSugarPagedListTimerOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-string.ts

@@ -48,9 +48,9 @@ export interface AdminResultString {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultString
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sys-code-gen-config.ts

@@ -49,9 +49,9 @@ export interface AdminResultSysCodeGenConfig {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSysCodeGenConfig
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sys-code-gen.ts

@@ -49,9 +49,9 @@ export interface AdminResultSysCodeGen {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSysCodeGen
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sys-config.ts

@@ -49,9 +49,9 @@ export interface AdminResultSysConfig {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSysConfig
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sys-dict-data.ts

@@ -49,9 +49,9 @@ export interface AdminResultSysDictData {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSysDictData
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sys-dict-type.ts

@@ -49,9 +49,9 @@ export interface AdminResultSysDictType {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSysDictType
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-sys-tenant.ts

@@ -49,9 +49,9 @@ export interface AdminResultSysTenant {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSysTenant
      */
-    timestamp?: number;
+    time?: Date;
 }

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

@@ -49,9 +49,9 @@ export interface AdminResultSysUser {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultSysUser
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-we-chat-pay-output.ts

@@ -49,9 +49,9 @@ export interface AdminResultWeChatPayOutput {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultWeChatPayOutput
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/admin-result-we-chat-pay.ts

@@ -49,9 +49,9 @@ export interface AdminResultWeChatPay {
      */
     extras?: any | null;
     /**
-     * 时间戳
-     * @type {number}
+     * 时间
+     * @type {Date}
      * @memberof AdminResultWeChatPay
      */
-    timestamp?: number;
+    time?: Date;
 }

Web/src/api-services/models/delete-data-resource-input.ts

@@ -1,26 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * 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 DeleteDataResourceInput
- */
-export interface DeleteDataResourceInput {
-    /**
-     * 主键Id
-     * @type {number}
-     * @memberof DeleteDataResourceInput
-     */
-    id: number;
-}

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

@@ -1,6 +1,5 @@
 export * from './add-code-gen-input';
 export * from './add-config-input';
-export * from './add-data-resource-input';
 export * from './add-dict-data-input';
 export * from './add-dict-type-input';
 export * from './add-menu-input';
@@ -27,7 +26,6 @@ export * from './admin-result-list-role-output';
 export * from './admin-result-list-selector-dto';
 export * from './admin-result-list-string';
 export * from './admin-result-list-sys-config';
-export * from './admin-result-list-sys-data-resource';
 export * from './admin-result-list-sys-dict-data';
 export * from './admin-result-list-sys-dict-type';
 export * from './admin-result-list-sys-file';
@@ -76,7 +74,6 @@ export * from './db-table-info-input';
 export * from './db-type';
 export * from './delete-code-gen-input';
 export * from './delete-config-input';
-export * from './delete-data-resource-input';
 export * from './delete-dict-data-input';
 export * from './delete-dict-type-input';
 export * from './delete-file-input';
@@ -142,7 +139,6 @@ export * from './swagger-submit-url-body';
 export * from './sys-code-gen';
 export * from './sys-code-gen-config';
 export * from './sys-config';
-export * from './sys-data-resource';
 export * from './sys-dict-data';
 export * from './sys-dict-type';
 export * from './sys-file';
@@ -167,7 +163,6 @@ export * from './time-span';
 export * from './timer-output';
 export * from './update-code-gen-input';
 export * from './update-config-input';
-export * from './update-data-resource-input';
 export * from './update-dict-data-input';
 export * from './update-dict-type-input';
 export * from './update-menu-input';

Web/src/api-services/models/sys-data-resource.ts

@@ -1,106 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * 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 { StatusEnum } from './status-enum';
-import { SysDataResource } from './sys-data-resource';
-/**
- * 数据资源表
- * @export
- * @interface SysDataResource
- */
-export interface SysDataResource {
-    /**
-     * 雪花Id
-     * @type {number}
-     * @memberof SysDataResource
-     */
-    id?: number;
-    /**
-     * 创建时间
-     * @type {Date}
-     * @memberof SysDataResource
-     */
-    createTime?: Date | null;
-    /**
-     * 更新时间
-     * @type {Date}
-     * @memberof SysDataResource
-     */
-    updateTime?: Date | null;
-    /**
-     * 创建者Id
-     * @type {number}
-     * @memberof SysDataResource
-     */
-    createUserId?: number | null;
-    /**
-     * 修改者Id
-     * @type {number}
-     * @memberof SysDataResource
-     */
-    updateUserId?: number | null;
-    /**
-     * 软删除
-     * @type {boolean}
-     * @memberof SysDataResource
-     */
-    isDelete?: boolean;
-    /**
-     * 父节点Id
-     * @type {number}
-     * @memberof SysDataResource
-     */
-    pid?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof SysDataResource
-     */
-    name?: string | null;
-    /**
-     * 值
-     * @type {string}
-     * @memberof SysDataResource
-     */
-    value?: string | null;
-    /**
-     * 节点编码
-     * @type {string}
-     * @memberof SysDataResource
-     */
-    code?: string | null;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysDataResource
-     */
-    order?: number;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysDataResource
-     */
-    remark?: string | null;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysDataResource
-     */
-    status?: StatusEnum;
-    /**
-     * 数据资源子项
-     * @type {Array<SysDataResource>}
-     * @memberof SysDataResource
-     */
-    children?: Array<SysDataResource> | null;
-}

Web/src/api-services/models/update-data-resource-input.ts

@@ -1,68 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Admin.NET
- * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
- *
- * OpenAPI spec version: 1.0.0
- * Contact: 515096995@qq.com
- *
- * 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 UpdateDataResourceInput
- */
-export interface UpdateDataResourceInput {
-    /**
-     * 主键Id
-     * @type {number}
-     * @memberof UpdateDataResourceInput
-     */
-    id: number;
-    /**
-     * 父Id
-     * @type {number}
-     * @memberof UpdateDataResourceInput
-     */
-    pid?: number;
-    /**
-     * 值
-     * @type {string}
-     * @memberof UpdateDataResourceInput
-     */
-    value?: string | null;
-    /**
-     * 编码
-     * @type {string}
-     * @memberof UpdateDataResourceInput
-     */
-    code?: string | null;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof UpdateDataResourceInput
-     */
-    order?: number;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof UpdateDataResourceInput
-     */
-    remark?: string | null;
-    /**
-     * 状态
-     * @type {number}
-     * @memberof UpdateDataResourceInput
-     */
-    status?: number;
-    /**
-     * 名称
-     * @type {string}
-     * @memberof UpdateDataResourceInput
-     */
-    name: string;
-}

Web/src/views/system/cache/index.vue

@@ -0,0 +1,144 @@
+<template>
+	<div class="sys-cache-container">
+		<NoticeBar text="系统缓存数据管理，请慎重操作！" leftIcon="iconfont icon-tongzhi2" background="var(--el-color-primary-light-9)" color="var(--el-color-primary)" />
+		<el-row :gutter="8" style="width: 100%">
+			<el-col :span="4" :xs="24">
+				<el-card shadow="hover" header="缓存列表" v-loading="loading" class="mt8">
+					<template #header>
+						<div class="card-header">
+							<span>缓存列表</span>
+							<el-button icon="ele-Refresh" size="small" circle text @click="handleQuery" v-auth="'sysCache:page'" />
+						</div>
+					</template>
+					<el-tree
+						ref="treeRef"
+						class="filter-tree"
+						:data="cacheData"
+						node-key="id"
+						:props="{ children: 'children', label: 'name' }"
+						@node-click="nodeClick"
+						:default-checked-keys="cacheData"
+						highlight-current
+						check-strictly
+						default-expand-all
+						accordion
+					/>
+				</el-card>
+			</el-col>
+			<el-col :span="20" :xs="24">
+				<el-card shadow="hover" header="缓存数据" v-loading="loading1" class="mt8">
+					<template #header>
+						<div class="card-header">
+							<span>缓存数据</span>
+							<el-button icon="ele-Delete" size="small" type="danger" @click="delCache" v-auth="'sysCache:delete'"> 删除缓存 </el-button>
+						</div>
+					</template>
+					<vue-json-pretty :data="cacheValue" showLength showIcon showLineNumber showSelectController style="background-color: #ffffff" />
+				</el-card>
+			</el-col>
+		</el-row>
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, defineComponent, ref } from 'vue';
+import { ElMessageBox, ElMessage, ElTree } from 'element-plus';
+import NoticeBar from '/@/components/noticeBar/index.vue';
+import VueJsonPretty from 'vue-json-pretty';
+import 'vue-json-pretty/lib/styles.css';
+
+import { getAPI } from '/@/utils/axios-utils';
+import { SysCacheApi } from '/@/api-services';
+
+export default defineComponent({
+	name: 'sysCache',
+	components: { NoticeBar, VueJsonPretty },
+	setup() {
+		const treeRef = ref<InstanceType<typeof ElTree>>();
+		const currentNode = ref<any>({});
+		const state = reactive({
+			loading: false,
+			loading1: false,
+			cacheData: [] as any,
+			cacheValue: undefined,
+		});
+		onMounted(async () => {
+			handleQuery();
+		});
+		// 查询操作
+		const handleQuery = async () => {
+			state.cacheData = [];
+
+			state.loading = true;
+			var res = await getAPI(SysCacheApi).sysCacheKeyListGet();
+			let keyList: any = res.data.result;
+
+			// 构造树（以分号分割）
+			for (let i = 0; i < keyList.length; i++) {
+				let keyNames = keyList[i].split(':');
+				let pName = keyNames[0];
+				if (state.cacheData.filter((x: any) => x.name == pName).length === 0) {
+					state.cacheData.push({
+						id: 0,
+						name: pName,
+						children: [],
+					});
+				}
+				if (keyNames.length > 1) {
+					let pNode = state.cacheData.filter((x: any) => x.name == pName)[0] || {};
+					pNode.children.push({
+						id: keyList[i],
+						name: keyList[i].substr(pName.length + 1),
+					});
+				}
+			}
+			state.loading = false;
+		};
+		// 删除
+		const delCache = () => {
+			if (currentNode.value.id == 0) {
+				ElMessage.warning('禁止删除顶层缓存');
+				return;
+			}
+			ElMessageBox.confirm(`确定删除缓存：【${currentNode.value.id}】?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					await getAPI(SysCacheApi).sysCacheRemovePost(currentNode.value.id);
+					handleQuery();
+					state.cacheValue = undefined;
+					ElMessage.success('删除成功');
+				})
+				.catch(() => {});
+		};
+		// 树点击
+		const nodeClick = async (node: any) => {
+			if (node.id == 0) return;
+
+			currentNode.value = node;
+			state.loading1 = true;
+			var res = await getAPI(SysCacheApi).sysCacheDetailGet(node.id);
+			state.cacheValue = res.data.result;
+			state.loading1 = false;
+		};
+		return {
+			treeRef,
+			handleQuery,
+			delCache,
+			nodeClick,
+			...toRefs(state),
+		};
+	},
+});
+</script>
++
+
+<style lang="scss">
+.card-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+</style>

Web/src/views/system/org/component/orgTree.vue

@@ -63,7 +63,7 @@ const state = reactive({
 });
 
 onMounted(() => {
-	initTreeData();
+	// initTreeData();
 });
 
 watch(filterText, (val) => {
@@ -121,9 +121,9 @@ const nodeClick = (node: any) => {
 	emits('node-click', { id: node.id, name: node.name });
 };
 
-const orgTreeData = state.orgData; // 异步数据导出不了？
+//const orgTreeData = state.orgData; // 异步数据导出不了？
 // 导出
-defineExpose({ orgTreeData, setCheckedKeys, getCheckedKeys, updateTreeData });
+defineExpose({ setCheckedKeys, getCheckedKeys, updateTreeData });
 </script>
 
 <style scoped>

Web/src/views/system/org/index.vue

@@ -37,8 +37,8 @@
 						<el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
 						<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 							<template #default="scope">
-								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditOrg(scope.row)" v-auth="'sysOrg:update'">编辑 </el-button>
-								<el-button icon="ele-Delete" size="small" text type="danger" @click="delOrg(scope.row)" v-auth="'sysOrg:delete'">删除 </el-button>
+								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditOrg(scope.row)" v-auth="'sysOrg:update'"> 编辑 </el-button>
+								<el-button icon="ele-Delete" size="small" text type="danger" @click="delOrg(scope.row)" v-auth="'sysOrg:delete'"> 删除 </el-button>
 							</template>
 						</el-table-column>
 					</el-table>

Web/src/views/system/user/index.vue

@@ -142,11 +142,12 @@ export default defineComponent({
 		onUnmounted(() => {
 			proxy.mittBus.off('submitRefresh');
 		});
-		// 查询机构数据(可以从机构组件里面获取)
+		// 查询机构数据
 		const loadOrgData = async () => {
 			state.loading = true;
 			var res = await getAPI(SysOrgApi).sysOrgListGet(0);
 			state.orgTreeData = res.data.result;
+			orgTreeRef.value.updateTreeData(state.orgTreeData); // 赋值机构树
 			state.loading = false;
 		};
 		// 查询操作