🔄refactor: 统一返回给前端的数据结构

Infrastructure/Response.cs

@@ -29,6 +29,6 @@
         /// <summary>
         /// 回传的结果
         /// </summary>
-        public T Result { get; set; }
+        public T Data { get; set; }
     }
 }

OpenAuth.App/Base/PagedDynamicDataResp.cs

@@ -18,41 +18,33 @@ using OpenAuth.Repository.Domain;
 namespace OpenAuth.App.Response
 {
     /// <summary>
-    /// table的返回数据
+    /// 返回动态数据类型的分页数据
+    /// <para>带有列定义</para>
     /// </summary>
-    public class TableData
+    public class PagedDynamicDataResp : Infrastructure.Response
     {
-        /// <summary>
-        /// 状态码
-        /// </summary>
-        public int code { get; set; }
-        /// <summary>
-        /// 操作消息
-        /// </summary>
-        public string msg { get; set; }
-
         /// <summary>
         /// 总记录条数
         /// </summary>
-        public int count { get; set; }
+        public int Count { get; set; }
 
        
         /// <summary>
         ///  返回的表格列定义
         /// 该属性基于代码生成使用的列定义
         /// </summary>
-        public List<BuilderTableColumn> columnFields;
+        public List<BuilderTableColumn> ColumnFields{ get; set; }
 
         /// <summary>
         /// 数据内容
         /// </summary>
-        public dynamic data { get; set; }
+        public dynamic Data { get; set; }
 
-        public TableData()
+        public PagedDynamicDataResp()
         {
-            code = 200;
+            Code = 200;
-            msg = "加载成功";
+            Message = "加载成功";
-            columnFields = new List<BuilderTableColumn>();
+            ColumnFields = new List<BuilderTableColumn>();
         }
     }
 }

OpenAuth.App/Base/PagedListDataResp.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using Infrastructure;
+
+namespace OpenAuth.App.Response
+{
+    /// <summary>
+    /// 返回确定类型的表格数据，可以为swagger提供精准的注释
+    /// </summary>
+    public class PagedListDataResp<T> : Infrastructure.Response
+    {
+        /// <summary>
+        /// 总记录条数
+        /// </summary>
+        public int Count { get; set; }
+
+        /// <summary>
+        /// 数据内容
+        /// </summary>
+        public List<T> Data { get; set; }
+        
+
+        public PagedListDataResp()
+        {
+            Code = 200;
+            Message = "加载成功";
+        }
+    }
+}

OpenAuth.App/Base/TableResp.cs

@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-using Infrastructure;
-
-namespace OpenAuth.App.Response
-{
-    /// <summary>
-    /// 返回确定类型的表格数据，可以为swagger提供精准的注释
-    /// </summary>
-    public class TableResp<T>
-    {
-        /// <summary>
-        /// 状态码
-        /// </summary>
-        public int code { get; set; }
-        /// <summary>
-        /// 操作消息
-        /// </summary>
-        public string msg { get; set; }
-
-        /// <summary>
-        /// 总记录条数
-        /// </summary>
-        public int count { get; set; }
-
-        /// <summary>
-        /// 数据内容
-        /// </summary>
-        public List<T> data { get; set; }
-        
-        /// <summary>
-        ///  返回的列表头信息
-        /// </summary>
-        public List<KeyDescription> columnHeaders { get; set; }
-
-        public TableResp()
-        {
-            code = 200;
-            msg = "加载成功";
-            columnHeaders = new List<KeyDescription>();
-        }
-    }
-}

OpenAuth.App/BuilderTable/BuilderTableApp.cs

@@ -78,7 +78,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableResp<BuilderTable>> Load(QueryBuilderTableListReq request)
+        public async Task<PagedListDataResp<BuilderTable>> Load(QueryBuilderTableListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -86,17 +86,17 @@ namespace OpenAuth.App
                 throw new CommonException("登录已过期", Define.INVALID_TOKEN);
             }
 
-            var result = new TableResp<BuilderTable>();
+            var result = new PagedListDataResp<BuilderTable>();
             var objs = UnitWork.Find<BuilderTable>(null);
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.Id.Contains(request.key));
             }
 
-            result.data = await objs.OrderBy(u => u.Id)
+            result.Data = await objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 
@@ -864,17 +864,17 @@ namespace OpenAuth.App
         /// 加载所有的主表（parentId为空的）
         /// </summary>
         /// <returns></returns>
-        public async Task<TableData> AllMain()
+        public async Task<PagedDynamicDataResp> AllMain()
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = UnitWork.Find<BuilderTable>(u => string.IsNullOrEmpty(u.ParentTableId)).Select(u => new
             {
                 Id = u.Id,
                 Name = u.TableName
             });
 
-            result.data = await objs.OrderBy(u => u.Id).ToListAsync();
+            result.Data = await objs.OrderBy(u => u.Id).ToListAsync();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
     }

OpenAuth.App/BuilderTable/BuilderTableColumnApp.cs

@@ -21,24 +21,24 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableResp<BuilderTableColumn>> Load(QueryBuilderTableColumnListReq request)
+        public async Task<PagedListDataResp<BuilderTableColumn>> Load(QueryBuilderTableColumnListReq request)
         {
             if (string.IsNullOrEmpty(request.BuilderTableId))
             {
                 throw new Exception($"缺少必要的参数BuilderTableId");
             }
-            var result = new TableResp<BuilderTableColumn>();
+            var result = new PagedListDataResp<BuilderTableColumn>();
             var objs = Repository.AsQueryable().Where(u => u.TableId == request.BuilderTableId);
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.ColumnName.Contains(request.key));
             }
-            result.data = await objs.OrderByDescending(u => u.IsList)
+            result.Data = await objs.OrderByDescending(u => u.IsList)
                 .OrderBy(u => u.Sort)
                 .OrderBy(u => u.ColumnName)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
         public void Update(AddOrUpdateBuilderTableColumnReq obj)

OpenAuth.App/Category/CategoryApp.cs

@@ -16,7 +16,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryCategoryListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryCategoryListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -36,7 +36,7 @@ namespace OpenAuth.App
                 };
             }
             
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = SugarClient.Queryable<Category>();
             if (!string.IsNullOrEmpty(request.TypeId))
             {
@@ -54,11 +54,11 @@ namespace OpenAuth.App
             }
 
             var propertyStr = string.Join(',', columnFields.Select(u =>u.ColumnName));
-            result.columnFields = columnFields;
+            result.ColumnFields = columnFields;
-            result.data = objs.OrderBy(u => u.DtCode)
+            result.Data = objs.OrderBy(u => u.DtCode)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).Select($"{propertyStr}").ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 

OpenAuth.App/Category/CategoryTypeApp.cs

@@ -21,19 +21,19 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryCategoryTypeListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryCategoryTypeListReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = UnitWork.Find<CategoryType>(null);
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.Id.Contains(request.key) || u.Name.Contains(request.key));
             }
             
-            result.data =await objs.OrderBy(u => u.Name)
+            result.Data =await objs.OrderBy(u => u.Name)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count =await objs.CountAsync();
+            result.Count =await objs.CountAsync();
             return result;
         }
 

OpenAuth.App/DataPrivilege/DataPrivilegeRuleApp.cs

@@ -15,7 +15,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryDataPrivilegeRuleListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryDataPrivilegeRuleListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -29,7 +29,7 @@ namespace OpenAuth.App
                 throw new Exception("请在代码生成界面配置DataPrivilegeRule表的字段属性");
             }
 
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = SugarClient.Queryable<DataPrivilegeRule>();
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -41,11 +41,11 @@ namespace OpenAuth.App
             }
 
             var propertyStr = string.Join(',', columnFields.Select(u => u.ColumnName));
-            result.columnFields = columnFields;
+            result.ColumnFields = columnFields;
-            result.data = objs.OrderBy(u => u.Id)
+            result.Data = objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).Select($"{propertyStr}").ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 

OpenAuth.App/DynamicApiApp/DynamicApiApp.cs

@@ -36,16 +36,16 @@ namespace OpenAuth.App
         /// </summary>
         /// <param name="req">查询参数</param>
         /// <returns></returns>
-        public async Task<TableData> GetList(QueryDynamicListReq req)
+        public async Task<PagedDynamicDataResp> GetList(QueryDynamicListReq req)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             try
             {
                 // 验证表名是否存在
                 if (!TableExists(req.TableName))
                 {
-                    result.code = 500;
+                    result.Code = 500;
-                    result.msg = $"表不存在：{req.TableName}";
+                    result.Message = $"表不存在：{req.TableName}";
                     return result;
                 }
 
@@ -78,13 +78,13 @@ namespace OpenAuth.App
                     .Take(req.limit)
                     .ToListAsync();
 
-                result.data = list;
+                result.Data = list;
-                result.count = total;
+                result.Count = total;
             }
             catch (Exception ex)
             {
-                result.code = 500;
+                result.Code = 500;
-                result.msg = ex.InnerException?.Message ?? ex.Message;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
             }
 
             return result;
@@ -122,7 +122,7 @@ namespace OpenAuth.App
                     return result;
                 }
 
-                result.Result = entity;
+                result.Data = entity;
             }
             catch (Exception ex)
             {

OpenAuth.App/ExtDataSourceApp/ExtDataSourceApp.cs

@@ -18,7 +18,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryExternalDataSourceListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryExternalDataSourceListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -26,7 +26,7 @@ namespace OpenAuth.App
                 throw new CommonException("登录已过期", Define.INVALID_TOKEN);
             }
 
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -37,10 +37,10 @@ namespace OpenAuth.App
                 objs = objs.Where(request.sqlWhere);
             }
 
-            result.data = objs.OrderBy(u => u.Name)
+            result.Data = objs.OrderBy(u => u.Name)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 
@@ -48,15 +48,15 @@ namespace OpenAuth.App
         /// 获取数据库类型
         /// </summary>
         /// <returns></returns>
-        public TableData GetDbTypes()
+        public PagedDynamicDataResp GetDbTypes()
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             // 创建包含键值对的列表
             var dbTypeList = Enum.GetValues(typeof(DbType))
                 .Cast<DbType>()
                 .Select(item => new { label = item.ToString(), value = (int)item })
                 .ToList();
-            result.data = dbTypeList;
+            result.Data = dbTypeList;
             return result;
         }
 

OpenAuth.App/Files/FileApp.cs

@@ -44,19 +44,19 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载附件列表
         /// </summary>
-        public async Task<TableData> Load(QueryFileListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryFileListReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = UnitWork.Find<UploadFile>(null);
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.FileName.Contains(request.key) || u.FilePath.Contains(request.key));
             }
 
-            result.data =await objs.OrderByDescending(u => u.CreateTime)
+            result.Data =await objs.OrderByDescending(u => u.CreateTime)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count =await objs.CountAsync();
+            result.Count =await objs.CountAsync();
             return result;
         }
         

OpenAuth.App/FlowApproverApp/FlowApproverApp.cs

@@ -70,13 +70,13 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载当前节点的加签人
         /// </summary>
-        public async Task<TableResp<FlowApprover>> Load(QueryApproverReq request)
+        public async Task<PagedListDataResp<FlowApprover>> Load(QueryApproverReq request)
         {
             var objs = await Repository.GetListAsync(u =>
                 u.InstanceId == request.FlowInstanceId && u.ActivityId == request.ActivityId);
-            return new TableResp<FlowApprover>()
+            return new PagedListDataResp<FlowApprover>()
             {
-                data = objs
+                Data = objs
             };
         }
 

OpenAuth.App/FlowInstance/FlowInstanceApp.cs

@@ -672,9 +672,9 @@ namespace OpenAuth.App
             return resp;
         }
 
-        public async Task<TableData> Load(QueryFlowInstanceListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryFlowInstanceListReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var user = _auth.GetCurrentUser();
             //行转列专用SQL
             string groupConcatSql = $@" ( SELECT GROUP_CONCAT(Account SEPARATOR ',')
@@ -828,8 +828,8 @@ namespace OpenAuth.App
             var finalQuery = SugarClient.SqlQueryable<FlowInstance>(sql)
                 .WhereIF(!string.IsNullOrEmpty(request.key), t => t.CustomName.Contains(request.key));
 
-            result.count = await finalQuery.CountAsync();
+            result.Count = await finalQuery.CountAsync();
-            result.data = await finalQuery.OrderByDescending(u => u.CreateDate)
+            result.Data = await finalQuery.OrderByDescending(u => u.CreateDate)
                 .ToPageListAsync(request.page, request.limit);
 
             return result;

OpenAuth.App/FlowScheme/FlowSchemeApp.cs

@@ -64,19 +64,19 @@ namespace OpenAuth.App
         }
 
 
-        public async Task<TableData> Load(QueryFlowSchemeListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryFlowSchemeListReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.SchemeName.Contains(request.key) || u.Id.Contains(request.key));
             }
 
-            result.data = await objs.OrderByDescending(u => u.CreateDate)
+            result.Data = await objs.OrderByDescending(u => u.CreateDate)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 

OpenAuth.App/Form/FormApp.cs

@@ -23,19 +23,19 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryFormListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryFormListReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var forms = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
                 forms = forms.Where(u => u.Name.Contains(request.key) || u.Id.Contains(request.key));
             }
 
-            result.data = forms.OrderByDescending(u => u.CreateDate)
+            result.Data = forms.OrderByDescending(u => u.CreateDate)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToList();
-            result.count = await forms.CountAsync();
+            result.Count = await forms.CountAsync();
             return result;
         }
 

OpenAuth.App/FrmLeave/FrmLeaveReqApp.cs

@@ -18,12 +18,12 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryFrmLeaveReqListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryFrmLeaveReqListReq request)
         {
-             return new TableData
+             return new PagedDynamicDataResp
             {
-                count = await Repository.CountAsync(null),
+                Count = await Repository.CountAsync(null),
-                data = await Repository.Find(request.page, request.limit, "Id desc").ToListAsync()
+                Data = await Repository.Find(request.page, request.limit, "Id desc").ToListAsync()
             };
         }
 

OpenAuth.App/Jobs/OpenJobApp.cs

@@ -28,19 +28,19 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryOpenJobListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryOpenJobListReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = SugarClient.Queryable<OpenJob>();
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.Id.Contains(request.key));
             }
 
-            result.data =await objs.OrderBy(u => u.Id)
+            result.Data =await objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count =await objs.CountAsync();
+            result.Count =await objs.CountAsync();
             return result;
         }
 

OpenAuth.App/Resources/ResourceApp.cs

@@ -69,7 +69,7 @@ namespace OpenAuth.App
             return SugarClient.Queryable<SysResource>().Where(u => elementIds.Contains(u.Id) && (appId == null || appId =="" || u.AppId == appId)).ToArray();
         }
         
-        public async Task<TableData> Load(QueryResourcesReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryResourcesReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -84,7 +84,7 @@ namespace OpenAuth.App
             }
 
 
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var resources = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -104,11 +104,11 @@ namespace OpenAuth.App
             var columnnames = columnFields.Select(u => u.ColumnName);
             
             var propertyStr = string.Join(',', columnnames);
-            result.columnFields = columnFields;
+            result.ColumnFields = columnFields;
-            result.data = resources.OrderBy(u => u.TypeId)
+            result.Data = resources.OrderBy(u => u.TypeId)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).Select($"{propertyStr}").ToList();
-            result.count = await resources.CountAsync();
+            result.Count = await resources.CountAsync();
             return result;
         }
 

OpenAuth.App/RoleManager/RoleApp.cs

@@ -36,19 +36,19 @@ namespace OpenAuth.App
         /// 获取所有的角色
         /// 为了控制权限，通常只用于流程实例选择执行角色，其他地方请使用Load
         /// </summary>
-        public async Task<TableResp<Role>> LoadAll(QueryRoleListReq request)
+        public async Task<PagedListDataResp<Role>> LoadAll(QueryRoleListReq request)
         {
-            var result = new TableResp<Role>();
+            var result = new PagedListDataResp<Role>();
             var objs = UnitWork.Find<Role>(null);
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.Name.Contains(request.key));
             }
 
-            result.data = await objs.OrderBy(u => u.Name)
+            result.Data = await objs.OrderBy(u => u.Name)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 

OpenAuth.App/SysLogs/SysLogApp.cs

@@ -17,19 +17,19 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QuerySysLogListReq request)
+        public async Task<PagedDynamicDataResp> Load(QuerySysLogListReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = UnitWork.Find<SysLog>(null);
             if (!string.IsNullOrEmpty(request.key))
             {
                 objs = objs.Where(u => u.Content.Contains(request.key) || u.Id.Contains(request.key));
             }
 
-            result.data = await objs.OrderByDescending(u => u.CreateTime)
+            result.Data = await objs.OrderByDescending(u => u.CreateTime)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 

OpenAuth.App/SysMessage/SysMessageApp.cs

@@ -22,7 +22,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QuerySysMessageListReq request)
+        public async Task<PagedDynamicDataResp> Load(QuerySysMessageListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -30,7 +30,7 @@ namespace OpenAuth.App
                 throw new CommonException("登录已过期", Define.INVALID_TOKEN);
             }
 
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = UnitWork.Find<SysMessage>(u =>u.ToId == loginContext.User.Id && u.ToStatus != -1);
 
             if (!string.IsNullOrEmpty(request.key))
@@ -44,10 +44,10 @@ namespace OpenAuth.App
                 objs = objs.Where(u => u.ToStatus == request.Status);
             }
 
-            result.data =await objs.OrderByDescending(u => u.CreateTime)
+            result.Data =await objs.OrderByDescending(u => u.CreateTime)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToListAsync();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
 

OpenAuth.App/SysPrinterPlanApp/SysPrinterPlanApp.cs

@@ -17,7 +17,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QuerySysPrinterPlanListReq request)
+        public async Task<PagedDynamicDataResp> Load(QuerySysPrinterPlanListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -31,7 +31,7 @@ namespace OpenAuth.App
                 throw new Exception("请在代码生成界面配置SysPrinterPlan表的字段属性");
             }
 
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -47,17 +47,17 @@ namespace OpenAuth.App
             var columnnames = columnFields.Select(u => u.ColumnName);
            
             var propertyStr = string.Join(',', columnnames);
-            result.columnFields = columnFields;
+            result.ColumnFields = columnFields;
-            result.data = objs.OrderByDescending(u => u.CreateTime)
+            result.Data = objs.OrderByDescending(u => u.CreateTime)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).Select($"{propertyStr}").ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
         
-        public async Task<TableData> Query(QueryReq request)
+        public async Task<PagedDynamicDataResp> Query(QueryReq request)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
 
             var sugarParams = new List<SugarParameter>();
             if (!string.IsNullOrEmpty(request.ParamJsonStr))
@@ -70,8 +70,8 @@ namespace OpenAuth.App
             }
             
             var objs = await SugarClient.Ado.SqlQueryAsync<dynamic>(request.SourceSql,sugarParams);
-            result.count = SugarClient.Ado.SqlQuery<dynamic>(request.SourceSql, sugarParams).Count;
+            result.Count = SugarClient.Ado.SqlQuery<dynamic>(request.SourceSql, sugarParams).Count;
-            result.data = objs.Skip((request.page - 1) * request.limit)
+            result.Data = objs.Skip((request.page - 1) * request.limit)
                 .Take(request.limit).ToList();
 
             return result;

OpenAuth.App/UserManager/UserManagerApp.cs

@@ -32,7 +32,7 @@ namespace OpenAuth.App
         /// 加载当前登录用户可访问的一个部门及子部门全部用户
         /// 如果请求的request.OrgId为空，则可以获取到已被删除机构的用户（即：没有分配任何机构的用户）
         /// </summary>
-        public async Task<TableData> Load(QueryUserListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryUserListReq request)
         {
             var loginUser = _auth.GetCurrentUser();
             IQueryable<SysUser> query = UnitWork.Find<SysUser>(null);
@@ -99,10 +99,10 @@ namespace OpenAuth.App
                 OrganizationIds = string.Join(",", u.Select(x=>x.OrgId))
                 ,Organizations = string.Join(",", u.Select(x=>x.OrgName))
             });
-            return new TableData
+            return new PagedDynamicDataResp
             {
-                count =userViews.Count(),
+                Count =userViews.Count(),
-                data =userViews.OrderBy(u => u.Name)
+                Data =userViews.OrderBy(u => u.Name)
                     .Skip((request.page - 1) * request.limit)
                     .Take(request.limit),
             };
@@ -111,7 +111,7 @@ namespace OpenAuth.App
         /// 获取所有的用户
         /// 为了控制权限，通常只用于流程实例选择执行角色，其他地方请使用Load
         /// </summary>
-        public async Task<TableResp<UserView>> LoadAll(QueryUserListReq request)
+        public async Task<PagedListDataResp<UserView>> LoadAll(QueryUserListReq request)
         {
            IQueryable<SysUser> query = UnitWork.Find<SysUser>(null);
            if (!string.IsNullOrEmpty(request.key))
@@ -166,10 +166,10 @@ namespace OpenAuth.App
                 OrganizationIds = string.Join(",", u.Select(x=>x.OrgId))
                 ,Organizations = string.Join(",", u.Select(x=>x.OrgName))
             });
-            return new TableResp<UserView>()
+            return new PagedListDataResp<UserView>()
             {
-                count = userViews.Count(),
+                Count = userViews.Count(),
-                data = userViews.OrderBy(u => u.Name)
+                Data = userViews.OrderBy(u => u.Name)
                     .Skip((request.page - 1) * request.limit)
                     .Take(request.limit).ToList()
             };
@@ -252,17 +252,17 @@ namespace OpenAuth.App
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public async Task<TableData> LoadByRole(QueryUserListByRoleReq request)
+        public async Task<PagedDynamicDataResp> LoadByRole(QueryUserListByRoleReq request)
         {
             var users = from userRole in UnitWork.Find<Relevance>(u =>
                     u.SecondId == request.roleId && u.RelKey == Define.USERROLE)
                 join user in UnitWork.Find<SysUser>(null) on userRole.FirstId equals user.Id into temp
                 from c in temp.Where(u =>u.Id != null)
                 select c;
-            return new TableData
+            return new PagedDynamicDataResp
             {
-                count =await users.CountAsync(),
+                Count =await users.CountAsync(),
-                data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
+                Data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
             };
         }
         /// <summary>
@@ -270,17 +270,17 @@ namespace OpenAuth.App
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public async Task<TableData> LoadByOrg(QueryUserListByOrgReq request)
+        public async Task<PagedDynamicDataResp> LoadByOrg(QueryUserListByOrgReq request)
         {
             var users = from userOrg in UnitWork.Find<Relevance>(u =>
                     u.SecondId == request.orgId && u.RelKey == Define.USERORG)
                 join user in UnitWork.Find<SysUser>(null) on userOrg.FirstId equals user.Id into temp
                 from c in temp.Where(u =>u.Id != null)
                 select c;
-            return new TableData
+            return new PagedDynamicDataResp
             {
-                count =await users.CountAsync(),
+                Count =await users.CountAsync(),
-                data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
+                Data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
             };
         }
         /// <summary>

OpenAuth.App/WmsInbound/WmsInboundOrderDtblApp.cs

@@ -14,7 +14,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryWmsInboundOrderDtblListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryWmsInboundOrderDtblListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -26,7 +26,7 @@ namespace OpenAuth.App
             {
                 throw new Exception("请在代码生成界面配置WmsInboundOrderDtbl表的字段属性");
             }
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             var objs = SugarClient.Queryable<WmsInboundOrderDtbl>();
             if (!string.IsNullOrEmpty(request.InboundOrderId))
             {
@@ -37,11 +37,11 @@ namespace OpenAuth.App
                 objs = objs.Where(u => u.GoodsId.Contains(request.key));
             }
             var propertyStr = string.Join(',', properties.Select(u => u.ColumnName));
-            result.columnFields = properties;
+            result.ColumnFields = properties;
-            result.data = objs.OrderBy(u => u.Id)
+            result.Data = objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).Select($"{propertyStr}").ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
         public void Add(AddOrUpdateWmsInboundOrderDtblReq request)

OpenAuth.App/WmsInbound/WmsInboundOrderTblApp.cs

@@ -15,7 +15,7 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载列表
         /// </summary>
-        public async Task<TableData> Load(QueryWmsInboundOrderTblListReq request)
+        public async Task<PagedDynamicDataResp> Load(QueryWmsInboundOrderTblListReq request)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
@@ -27,8 +27,8 @@ namespace OpenAuth.App
             {
                 throw new Exception("请在代码生成界面配置WmsInboundOrderTbl表的字段属性");
             }
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
-            result.columnFields = columns;
+            result.ColumnFields = columns;
             var objs = GetDataPrivilege("u");
             if (!string.IsNullOrEmpty(request.key))
             {
@@ -39,10 +39,10 @@ namespace OpenAuth.App
                 objs = objs.Where(request.sqlWhere);
             }
             var propertyStr = string.Join(',', columns.Select(u => u.ColumnName));
-            result.data = objs.OrderBy(u => u.Id)
+            result.Data = objs.OrderBy(u => u.Id)
                 .Skip((request.page - 1) * request.limit)
                 .Take(request.limit).Select($"{propertyStr}").ToList();
-            result.count = await objs.CountAsync();
+            result.Count = await objs.CountAsync();
             return result;
         }
         public void Add(AddOrUpdateWmsInboundOrderTblReq request)

OpenAuth.WebApi/Controllers/ApplicationsController.cs

@@ -25,13 +25,13 @@ namespace OpenAuth.WebApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryAppListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryAppListReq request)
         {
             var applications =await _app.GetList(request);
-            return new TableData
+            return new PagedDynamicDataResp
             {
-                data = applications,
+                Data = applications,
-                count = applications.Count
+                Count = applications.Count
             };
         }
 

OpenAuth.WebApi/Controllers/BuilderTableColumnsController.cs

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<BuilderTableColumn>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -83,7 +83,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableResp<BuilderTableColumn>> Load([FromQuery]QueryBuilderTableColumnListReq request)
+        public async Task<PagedListDataResp<BuilderTableColumn>> Load([FromQuery]QueryBuilderTableColumnListReq request)
         {
             var tableResp = await _app.Load(request);
             return tableResp;

OpenAuth.WebApi/Controllers/BuilderTablesController.cs

@@ -30,7 +30,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<string>();
             try
             {
-                result.Result = _app.Add(obj);
+                result.Data = _app.Add(obj);
 
             }
             catch (Exception ex)
@@ -69,7 +69,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableResp<BuilderTable>> Load([FromQuery]QueryBuilderTableListReq request)
+        public async Task<PagedListDataResp<BuilderTable>> Load([FromQuery]QueryBuilderTableListReq request)
         {
             return await _app.Load(request);
         }
@@ -78,7 +78,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载所有的主表（parentId为空的）
         /// </summary>
         [HttpGet]
-        public async Task<TableData> AllMain()
+        public async Task<PagedDynamicDataResp> AllMain()
         {
             return await _app.AllMain();
         }

OpenAuth.WebApi/Controllers/CategoryTypesController.cs

@@ -60,7 +60,7 @@ using OpenAuth.App.Response;
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryCategoryTypeListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryCategoryTypeListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/CategorysController.cs

@@ -30,7 +30,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<Category>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -88,7 +88,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery] QueryCategoryListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery] QueryCategoryListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/CheckController.cs

@@ -57,7 +57,7 @@ namespace OpenAuth.WebApi.Controllers
             var resp = new Response<UserView>();
             try
             {
-                resp.Result = _authStrategyContext.User.MapTo<UserView>();
+                resp.Data = _authStrategyContext.User.MapTo<UserView>();
             }
             catch (Exception e)
             {
@@ -80,7 +80,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<bool>();
             try
             {
-                result.Result = _authUtil.CheckLogin();
+                result.Data = _authUtil.CheckLogin();
             }
             catch (Exception ex)
             {
@@ -99,7 +99,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<Role>>();
             try
             {
-                result.Result = _authStrategyContext.Roles;
+                result.Data = _authStrategyContext.Roles;
             }
             catch (CommonException ex)
             {
@@ -132,7 +132,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<BuilderTableColumn>>();
             try
             {
-                result.Result = _authStrategyContext.GetTableColumns(moduleCode);
+                result.Data = _authStrategyContext.GetTableColumns(moduleCode);
             }
             catch (Exception ex)
             {
@@ -151,7 +151,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<OrgView>>();
             try
             {
-                result.Result = _authStrategyContext.Orgs;
+                result.Data = _authStrategyContext.Orgs;
             }
             catch (CommonException ex)
             {
@@ -179,7 +179,7 @@ namespace OpenAuth.WebApi.Controllers
         /// <param name="orgId">机构ID</param>
         /// <returns></returns>
         [HttpGet]
-        public TableData GetSubOrgs(string orgId)
+        public PagedDynamicDataResp GetSubOrgs(string orgId)
         {
             string cascadeId = ".0.";
             if (!string.IsNullOrEmpty(orgId))
@@ -187,10 +187,10 @@ namespace OpenAuth.WebApi.Controllers
                 var org = _authStrategyContext.Orgs.SingleOrDefault(u => u.Id == orgId);
                 if (org == null)
                 {
-                    return new TableData
+                    return new PagedDynamicDataResp
                     {
-                        msg = "未找到指定的节点",
+                        Message = "未找到指定的节点",
-                        code = 500,
+                        Code = 500,
                     };
                 }
                 cascadeId = org.CascadeId;
@@ -200,10 +200,10 @@ namespace OpenAuth.WebApi.Controllers
                 .Where(u => u.CascadeId.Contains(cascadeId))
                 .OrderBy(u =>u.CascadeId);
 
-            return new TableData
+            return new PagedDynamicDataResp
             {
-                data = query.ToList(),
+                Data = query.ToList(),
-                count = query.Count(),
+                Count = query.Count(),
             };
         }
 
@@ -216,7 +216,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<ModuleView>>();
             try
             {
-                result.Result = _authStrategyContext.Modules;
+                result.Data = _authStrategyContext.Modules;
             }
             catch (CommonException ex)
             {
@@ -247,7 +247,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<IEnumerable<TreeItem<ModuleView>>>();
             try
             {
-                result.Result = _authStrategyContext.Modules.GenerateTree(u => u.Id, u => u.ParentId);
+                result.Data = _authStrategyContext.Modules.GenerateTree(u => u.Id, u => u.ParentId);
             }
             catch (CommonException ex)
             {
@@ -278,7 +278,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<SysResource>>();
             try
             {
-                result.Result = _authStrategyContext.Resources;
+                result.Data = _authStrategyContext.Resources;
             }
             catch (CommonException ex)
             {
@@ -309,7 +309,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<string>();
             try
             {
-                result.Result = _authStrategyContext.User.Account;
+                result.Data = _authStrategyContext.User.Account;
             }
             catch (CommonException ex)
             {
@@ -364,11 +364,11 @@ namespace OpenAuth.WebApi.Controllers
             var resp = new Response<bool>();
             try
             {
-                resp.Result = _authUtil.Logout();
+                resp.Data = _authUtil.Logout();
             }
             catch (Exception e)
             {
-                resp.Result = false;
+                resp.Data = false;
                 resp.Message = e.Message;
             }
 

OpenAuth.WebApi/Controllers/DataPrivilegeRulesController.cs

@@ -30,7 +30,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<DataPrivilegeRule>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -88,7 +88,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryDataPrivilegeRuleListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryDataPrivilegeRuleListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/DynamicApiController.cs

@@ -34,9 +34,9 @@ namespace OpenAuth.WebApi.Controllers
         /// <returns></returns>
         [HttpPost]
         [AllowAnonymous]
-        public async Task<TableData> GetList([FromBody] QueryDynamicListReq req)
+        public async Task<PagedDynamicDataResp> GetList([FromBody] QueryDynamicListReq req)
         {
-            TableData result = new TableData();
+            PagedDynamicDataResp result = new PagedDynamicDataResp();
             try
             {
                 // 获取实体类型
@@ -44,8 +44,8 @@ namespace OpenAuth.WebApi.Controllers
             }
             catch (Exception ex)
             {
-                result.code = 500;
+                result.Code = 500;
-                result.msg = ex.InnerException?.Message ?? ex.Message;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
             }
 
             return result;
@@ -160,7 +160,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<object>();
             try
             {
-                result.Result = await  _app.Invoke(req);
+                result.Data = await  _app.Invoke(req);
             }
             catch (Exception ex)
             {

OpenAuth.WebApi/Controllers/ExternalDataSourcesController.cs

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<ExternalDataSource>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -98,7 +98,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryExternalDataSourceListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryExternalDataSourceListReq request)
         {
             return await _app.Load(request);
         }
@@ -108,7 +108,7 @@ namespace OpenAuth.WebApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public TableData GetDbTypes()
+        public PagedDynamicDataResp GetDbTypes()
         {
             
             return _app.GetDbTypes();

OpenAuth.WebApi/Controllers/FilesController.cs

@@ -33,7 +33,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载附件列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryFileListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryFileListReq request)
         {
             return await _app.Load(request);
         }
@@ -74,7 +74,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<IList<UploadFile>>();
             try
             {
-                result.Result = _app.Add(files);
+                result.Data = _app.Add(files);
             }
             catch (Exception ex)
             {
@@ -99,7 +99,7 @@ namespace OpenAuth.WebApi.Controllers
             try
             {
                 var files = HttpContext.Request.Form.Files;
-                result.Result = _app.Add(files);
+                result.Data = _app.Add(files);
             }
             catch (Exception ex)
             {

OpenAuth.WebApi/Controllers/FlowApproversController.cs

@@ -59,7 +59,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableResp<FlowApprover>> Load([FromQuery] QueryApproverReq request)
+        public async Task<PagedListDataResp<FlowApprover>> Load([FromQuery] QueryApproverReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/FlowInstancesController.cs

@@ -33,7 +33,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<FlowVerificationResp>();
             try
             {
-                result.Result = _app.GetForVerification(id);
+                result.Data = _app.GetForVerification(id);
             }
             catch (Exception ex)
             {
@@ -53,7 +53,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<FlowInstanceOperationHistory>>();
             try
             {
-                result.Result= _app.QueryHistories(request);
+                result.Data= _app.QueryHistories(request);
             }
             catch (Exception ex)
             {
@@ -73,7 +73,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<string>();
             try
             {
-                result.Result = _app.CreateInstance(obj);
+                result.Data = _app.CreateInstance(obj);
             }
             catch (Exception ex)
             {
@@ -192,7 +192,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryFlowInstanceListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryFlowInstanceListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/FlowSchemesController.cs

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<FlowScheme>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -79,7 +79,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryFlowSchemeListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryFlowSchemeListReq request)
         {
             return await _app.Load(request);
         }
@@ -91,7 +91,7 @@ namespace OpenAuth.WebApi.Controllers
         public Response<List<FlowScheme>> LoadUrlFormFlowScheme()
         {
             var result = new Response<List<FlowScheme>>();
-            result.Result = _app.LoadUrlFormFlowScheme();
+            result.Data = _app.LoadUrlFormFlowScheme();
             return result;
         }
 

OpenAuth.WebApi/Controllers/FormsController.cs

@@ -31,11 +31,11 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<FormResp>();
             try
             {
-                result.Result = _app.FindSingle(id);
+                result.Data = _app.FindSingle(id);
 
                 if (!string.IsNullOrEmpty(canWriteFormItemIds))
                 {
-                    result.Result.CanWriteFormItemIds = JsonHelper.Instance.Deserialize<string[]>(canWriteFormItemIds);
+                    result.Data.CanWriteFormItemIds = JsonHelper.Instance.Deserialize<string[]>(canWriteFormItemIds);
                 }
             }
             catch (Exception ex)
@@ -89,7 +89,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryFormListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryFormListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/ModulesController.cs

@@ -37,7 +37,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<IEnumerable<Module>>();
             try
             {
-                result.Result = _app.LoadForRole(firstId);
+                result.Data = _app.LoadForRole(firstId);
             }
             catch (Exception ex)
             {
@@ -58,7 +58,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<IEnumerable<ModuleElement>>();
             try
             {
-                result.Result = _app.LoadMenusForRole(moduleId, firstId);
+                result.Data = _app.LoadMenusForRole(moduleId, firstId);
             }
             catch (Exception ex)
             {
@@ -81,7 +81,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<IEnumerable<string>>();
             try
             {
-                result.Result = _app.LoadPropertiesForRole(roleId, moduleCode);
+                result.Data = _app.LoadPropertiesForRole(roleId, moduleCode);
             }
             catch (Exception ex)
             {
@@ -105,7 +105,7 @@ namespace OpenAuth.WebApi.Controllers
                 var user = _authUtil.GetCurrentUser();
                 if (string.IsNullOrEmpty(moduleId))
                 {
-                    result.Result = user.ModuleElements;
+                    result.Data = user.ModuleElements;
                 }
                 else
                 {
@@ -115,7 +115,7 @@ namespace OpenAuth.WebApi.Controllers
                         throw new Exception("模块不存在");
                     }
 
-                    result.Result = module.Elements;
+                    result.Data = module.Elements;
                 }
             }
             catch (Exception ex)
@@ -138,7 +138,7 @@ namespace OpenAuth.WebApi.Controllers
             try
             {
                 _app.Add(obj);
-                result.Result = obj;
+                result.Data = obj;
             }
             catch (Exception ex)
             {
@@ -198,7 +198,7 @@ namespace OpenAuth.WebApi.Controllers
             try
             {
                 _app.AddMenu(obj);
-                result.Result = obj;
+                result.Data = obj;
             }
             catch (Exception ex)
             {
@@ -259,7 +259,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<SysPrinterPlan>>();
             try
             {
-                result.Result = _app.LoadPrinterPlans(moduleId).ToList();
+                result.Data = _app.LoadPrinterPlans(moduleId).ToList();
             }
             catch (Exception ex)
             {
@@ -279,7 +279,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<FlowScheme>>();
             try
             {
-                result.Result = _app.LoadFlowSchemes(moduleId).ToList();
+                result.Data = _app.LoadFlowSchemes(moduleId).ToList();
             }
             catch (Exception ex)
             {

OpenAuth.WebApi/Controllers/OpenJobsController.cs

@@ -28,7 +28,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<OpenJob>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -89,7 +89,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryOpenJobListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryOpenJobListReq request)
         {
             return await _app.Load(request);
         }
@@ -124,7 +124,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<string>>();
             try
             {
-                result.Result = _app.QueryLocalHandlers();
+                result.Data = _app.QueryLocalHandlers();
             }
             catch (Exception ex)
             {

OpenAuth.WebApi/Controllers/OrgsController.cs

@@ -25,7 +25,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<SysOrg>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -49,7 +49,7 @@ namespace OpenAuth.WebApi.Controllers
             try
             {
                 _app.Add(obj);
-                result.Result = obj;
+                result.Data = obj;
             }
             catch (Exception ex)
             {

OpenAuth.WebApi/Controllers/ResourcesController.cs

@@ -27,7 +27,7 @@ namespace OpenAuth.WebApi.Controllers
             _app = app;
         }
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryResourcesReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryResourcesReq request)
         {
             return await _app.Load(request);
         }
@@ -77,7 +77,7 @@ namespace OpenAuth.WebApi.Controllers
             try
             {
                 _app.Add(obj);
-                resp.Result = obj.Id;
+                resp.Data = obj.Id;
             }
             catch (Exception e)
             {
@@ -114,7 +114,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<SysResource>>();
             try
             {
-                result.Result = _app.LoadForRole(appId, firstId).ToList();
+                result.Data = _app.LoadForRole(appId, firstId).ToList();
 
             }
             catch (Exception e)
@@ -135,7 +135,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<SysResourceApp>>();
             try
             {
-                result.Result = await _app.GetResourceApps();
+                result.Data = await _app.GetResourceApps();
             }
             catch (Exception e)
             {

OpenAuth.WebApi/Controllers/RolesController.cs

@@ -32,7 +32,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<Role>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -53,7 +53,7 @@ namespace OpenAuth.WebApi.Controllers
             try
             {
                 _app.Add(obj);
-                result.Result = obj;
+                result.Data = obj;
 
             }
             catch (Exception ex)
@@ -93,7 +93,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 为了控制权限，通常只用于流程实例选择执行角色，其他地方请使用Load
         /// </summary>
         [HttpGet]
-        public async Task<TableResp<Role>> LoadAll([FromQuery]QueryRoleListReq request)
+        public async Task<PagedListDataResp<Role>> LoadAll([FromQuery]QueryRoleListReq request)
         {
             return await _app.LoadAll(request);
         }
@@ -107,7 +107,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<Role>>();
             try
             {
-                result.Result = _app.Load(request);
+                result.Data = _app.Load(request);
 
             }
             catch (Exception ex)
@@ -128,7 +128,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<string>>();
             try
             {
-                result.Result = _revelanceManagerApp.Get(Define.USERROLE, true, userId);
+                result.Data = _revelanceManagerApp.Get(Define.USERROLE, true, userId);
             }
             catch (Exception e)
             {

OpenAuth.WebApi/Controllers/SysConfController.cs

@@ -38,7 +38,7 @@ namespace OpenAuth.WebApi.Controllers
         {
             return new Response<bool>
             {
-                Result = _appConfiguration.Value.IsIdentityAuth
+                Data = _appConfiguration.Value.IsIdentityAuth
             };
         }
 
@@ -54,7 +54,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<SysTableColumn>>();
             try
             {
-                result.Result = _dbExtension.GetDbTableStructure(tableName, externalDataSourceId).ToList();
+                result.Data = _dbExtension.GetDbTableStructure(tableName, externalDataSourceId).ToList();
             }
             catch (Exception ex)
             {
@@ -71,12 +71,12 @@ namespace OpenAuth.WebApi.Controllers
         /// <param name="externalDataSourceId">外部数据源ID</param>
         /// <returns></returns>
         [HttpGet]
-        public TableData GetDbTableStructureForSelect(string tableName, string externalDataSourceId)
+        public PagedDynamicDataResp GetDbTableStructureForSelect(string tableName, string externalDataSourceId)
         {
-            var result = new TableData();
+            var result = new PagedDynamicDataResp();
             try
             {
-                result.data = _dbExtension.GetDbTableStructure(tableName, externalDataSourceId).Select(u => new
+                result.Data = _dbExtension.GetDbTableStructure(tableName, externalDataSourceId).Select(u => new
                 {
                     Id = u.ColumnName,
                     Name = u.ColumnName
@@ -84,8 +84,8 @@ namespace OpenAuth.WebApi.Controllers
             }
             catch (Exception ex)
             {
-                result.code = 500;
+                result.Code = 500;
-                result.msg = ex.Message;
+                result.Message = ex.Message;
             }
             return result;
         }

OpenAuth.WebApi/Controllers/SysLogsController.cs

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<SysLog>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -83,7 +83,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QuerySysLogListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QuerySysLogListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/SysMessagesController.cs

@@ -30,7 +30,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<SysMessage>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -68,7 +68,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QuerySysMessageListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QuerySysMessageListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/SysPrinterPlansController.cs

@@ -28,7 +28,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<SysPrinterPlan>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -46,7 +46,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<string>();
             try
             {
-                result.Result=_app.Add(obj);
+                result.Data=_app.Add(obj);
 
             }
             catch (Exception ex)
@@ -68,7 +68,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<DbTableInfo>>();
             try
             {
-                result.Result = _app.GetTables();
+                result.Data = _app.GetTables();
             }
             catch (Exception ex)
             {
@@ -90,7 +90,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<List<DbColumnInfo>>();
             try
             {
-                result.Result = _app.GetColumns(tableViewName);
+                result.Data = _app.GetColumns(tableViewName);
             }
             catch (Exception ex)
             {
@@ -124,7 +124,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QuerySysPrinterPlanListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QuerySysPrinterPlanListReq request)
         {
             return await _app.Load(request);
         }
@@ -133,7 +133,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 打印方案根据数据源获取打印数据
         /// </summary>
         [HttpPost]
-        public async Task<TableData> Query([FromBody] QueryReq request)
+        public async Task<PagedDynamicDataResp> Query([FromBody] QueryReq request)
         {
             return await _app.Query(request);
         }

OpenAuth.WebApi/Controllers/UsersController.cs

@@ -24,7 +24,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<UserView>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -89,7 +89,7 @@ namespace OpenAuth.WebApi.Controllers
             try
             {
                 _app.AddOrUpdate(obj);
-                result.Result = obj.Id;   //返回ID
+                result.Data = obj.Id;   //返回ID
             }
             catch (Exception ex)
             {
@@ -106,7 +106,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 获取当前登录用户可访问的一个部门及子部门全部用户
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryUserListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryUserListReq request)
         {
             return await _app.Load(request);
         }
@@ -116,7 +116,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 为了控制权限，通常只用于流程实例选择执行角色，其他地方请使用Load
         /// </summary>
         [HttpGet]
-        public async Task<TableResp<UserView>> LoadAll([FromQuery]QueryUserListReq request)
+        public async Task<PagedListDataResp<UserView>> LoadAll([FromQuery]QueryUserListReq request)
         {
             return await _app.LoadAll(request);
         }
@@ -143,7 +143,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载指定角色的用户
         /// </summary>
         [HttpGet]
-        public async Task<TableData> LoadByRole([FromQuery]QueryUserListByRoleReq request)
+        public async Task<PagedDynamicDataResp> LoadByRole([FromQuery]QueryUserListByRoleReq request)
         {
             return await _app.LoadByRole(request);
         }
@@ -153,7 +153,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 不包含下级部门的用户
         /// </summary>
         [HttpGet]
-        public async Task<TableData> LoadByOrg([FromQuery]QueryUserListByOrgReq request)
+        public async Task<PagedDynamicDataResp> LoadByOrg([FromQuery]QueryUserListByOrgReq request)
         {
             return await _app.LoadByOrg(request);
         }

OpenAuth.WebApi/Controllers/WmsInboundOrderDtblsController.cs

@@ -27,7 +27,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<WmsInboundOrderDtbl>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -46,7 +46,7 @@ namespace OpenAuth.WebApi.Controllers
             try
             {
                 _app.Add(obj);
-                result.Result = obj.Id;
+                result.Data = obj.Id;
             }
             catch (Exception ex)
             {
@@ -85,7 +85,7 @@ namespace OpenAuth.WebApi.Controllers
         /// </summary>
         [HttpGet]
         [AllowAnonymous]
-        public async Task<TableData> Load([FromQuery]QueryWmsInboundOrderDtblListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryWmsInboundOrderDtblListReq request)
         {
             return await _app.Load(request);
         }

OpenAuth.WebApi/Controllers/WmsInboundOrderTblsController.cs

@@ -26,7 +26,7 @@ namespace OpenAuth.WebApi.Controllers
             var result = new Response<WmsInboundOrderTbl>();
             try
             {
-                result.Result = _app.Get(id);
+                result.Data = _app.Get(id);
             }
             catch (Exception ex)
             {
@@ -90,7 +90,7 @@ namespace OpenAuth.WebApi.Controllers
         /// 加载列表
         /// </summary>
         [HttpGet]
-        public async Task<TableData> Load([FromQuery]QueryWmsInboundOrderTblListReq request)
+        public async Task<PagedDynamicDataResp> Load([FromQuery]QueryWmsInboundOrderTblListReq request)
         {
             return await _app.Load(request);
         }