diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs
index c521110..f4ea66b 100644
--- a/ZR.Admin.WebApi/Controllers/BaseController.cs
+++ b/ZR.Admin.WebApi/Controllers/BaseController.cs
@@ -5,7 +5,7 @@ using MiniExcelLibs;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using System.Web;
-using ff = System.IO;
+using Io = System.IO;
namespace ZR.Admin.WebApi.Controllers
{
@@ -61,7 +61,7 @@ namespace ZR.Admin.WebApi.Controllers
//IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
//string fileDir = Path.Combine(webHostEnvironment.WebRootPath, path, fileName);
- var stream = ff.File.OpenRead(path); //创建文件流
+ var stream = Io.File.OpenRead(path); //创建文件流
return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", HttpUtility.UrlEncode(fileName));
}
diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs
index 0134f54..e1662f7 100644
--- a/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs
@@ -10,7 +10,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor
[HttpGet("list")]
public IActionResult Index()
{
- return SUCCESS(null);
+ return SUCCESS(1);
}
}
}
diff --git a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
index 6314f5f..4d66ab2 100644
--- a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
+++ b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs
@@ -16,7 +16,7 @@ namespace ZR.Admin.WebApi.Filters
///
/// 权限字符串,例如 system:user:view
///
- public string Permission { get; set; }
+ public string Permission { get; set; } = string.Empty;
private bool HasPermi { get; set; }
private bool HasRole { get; set; }
public ActionPermissionFilter() { }
diff --git a/ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs b/ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs
index d382a03..65966a8 100644
--- a/ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs
+++ b/ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs
@@ -111,7 +111,7 @@ namespace ZR.Admin.WebApi.Filters
if (logAttribute != null)
{
sysOperLog.Title = logAttribute?.Title;
- sysOperLog.BusinessType = (int)logAttribute?.BusinessType;
+ sysOperLog.BusinessType = (int)logAttribute.BusinessType;
sysOperLog.OperParam = logAttribute.IsSaveRequestData ? sysOperLog.OperParam : "";
sysOperLog.JsonResult = logAttribute.IsSaveResponseData ? sysOperLog.JsonResult : "";
}
diff --git a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs b/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
index 2229736..886b45f 100644
--- a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
+++ b/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ZR.Admin.WebApi.Hubs
+namespace ZR.Admin.WebApi.Hubs
{
public class OnlineUsers
{
@@ -17,8 +13,8 @@ namespace ZR.Admin.WebApi.Hubs
public string Name { get; set; }
public DateTime LoginTime { get; set; }
public string UserIP { get; set; }
- public string Location { get; set; }
- public string Uuid{ get; set; }
+ public string? Location { get; set; }
+ public string? Uuid{ get; set; }
public OnlineUsers(string clientid, string name, long? userid, string userip)
{
diff --git a/ZR.Model/PagedInfo.cs b/ZR.Model/PagedInfo.cs
index 08ea554..b483b14 100644
--- a/ZR.Model/PagedInfo.cs
+++ b/ZR.Model/PagedInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
namespace ZR.Model
{
diff --git a/ZR.Model/PagerInfo.cs b/ZR.Model/PagerInfo.cs
index a29420b..5d69e2e 100644
--- a/ZR.Model/PagerInfo.cs
+++ b/ZR.Model/PagerInfo.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
-
-namespace ZR.Model
+namespace ZR.Model
{
public class PagerInfo
{
diff --git a/ZR.Model/System/Article.cs b/ZR.Model/System/Article.cs
index 0e2346e..4b07103 100644
--- a/ZR.Model/System/Article.cs
+++ b/ZR.Model/System/Article.cs
@@ -1,7 +1,5 @@
using SqlSugar;
using System;
-using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System
{
@@ -12,10 +10,22 @@ namespace ZR.Model.System
[Tenant("0")]
public class Article
{
+ ///
+ /// 文章id
+ ///
[SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
public int Cid { get; set; }
+ ///
+ /// 文章标题
+ ///
public string Title { get; set; }
+ ///
+ /// 发布时间
+ ///
public DateTime? CreateTime { get; set; }
+ ///
+ /// 更新时间
+ ///
[SugarColumn(IsOnlyIgnoreInsert = true)]
public DateTime? UpdateTime { get; set; }
///
@@ -26,11 +36,10 @@ namespace ZR.Model.System
/// 作者名
///
public string AuthorName { get; set; }
+ ///
+ /// 发布者用户id
+ ///
public long UserId { get; set; }
- /////
- /////
- /////
- //public string Type { get; set; }
///
/// 文章状态 1、发布 2、草稿
///
diff --git a/ZR.Model/System/ArticleCategory.cs b/ZR.Model/System/ArticleCategory.cs
index cdd134c..5c7b27f 100644
--- a/ZR.Model/System/ArticleCategory.cs
+++ b/ZR.Model/System/ArticleCategory.cs
@@ -2,7 +2,6 @@
using SqlSugar;
using System;
using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System
{
diff --git a/ZR.Model/System/CommonLang.cs b/ZR.Model/System/CommonLang.cs
index 84a0f91..99ee3fd 100644
--- a/ZR.Model/System/CommonLang.cs
+++ b/ZR.Model/System/CommonLang.cs
@@ -8,7 +8,7 @@ namespace ZR.Model.Models
///
/// 多语言配置,数据实体对象
///
- /// @author zr
+ /// @author mr.zhao
/// @date 2022-05-06
///
[Tenant("0")]
@@ -16,40 +16,35 @@ namespace ZR.Model.Models
public class CommonLang
{
///
- /// 描述 : id
- /// 空值 : false
+ /// id
///
[JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(IsPrimaryKey = true)]
public long Id { get; set; }
///
- /// 描述 : 语言code
- /// 空值 : false
+ /// 语言code
///
[DisplayName("语言code")]
[SugarColumn(ColumnName = "lang_code")]
public string LangCode { get; set; }
///
- /// 描述 : 语言key
- /// 空值 : true
+ /// 语言key
///
[DisplayName("语言key")]
[SugarColumn(ColumnName = "lang_key")]
public string LangKey { get; set; }
///
- /// 描述 : 名称
- /// 空值 : false
+ /// 名称
///
[DisplayName("名称")]
[SugarColumn(ColumnName = "lang_name")]
public string LangName { get; set; }
///
- /// 描述 : 添加时间
- /// 空值 : true
+ /// 添加时间
///
[DisplayName("添加时间")]
public DateTime? Addtime { get; set; }
diff --git a/ZR.Model/System/Dto/ArticleCategoryDto.cs b/ZR.Model/System/Dto/ArticleCategoryDto.cs
index 39ae5c4..c109a19 100644
--- a/ZR.Model/System/Dto/ArticleCategoryDto.cs
+++ b/ZR.Model/System/Dto/ArticleCategoryDto.cs
@@ -1,8 +1,5 @@
using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
-using ZR.Model.Dto;
-using ZR.Model.Models;
namespace ZR.Model.Dto
{
diff --git a/ZR.Model/System/Dto/ArticleDto.cs b/ZR.Model/System/Dto/ArticleDto.cs
index 28fd031..d12aaf6 100644
--- a/ZR.Model/System/Dto/ArticleDto.cs
+++ b/ZR.Model/System/Dto/ArticleDto.cs
@@ -1,7 +1,5 @@
using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
-using System.Text;
namespace ZR.Model.System.Dto
{
diff --git a/ZR.Model/System/Dto/CommonLangDto.cs b/ZR.Model/System/Dto/CommonLangDto.cs
index 18938a5..1e70d80 100644
--- a/ZR.Model/System/Dto/CommonLangDto.cs
+++ b/ZR.Model/System/Dto/CommonLangDto.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
namespace ZR.Model.Dto
{
diff --git a/ZR.Model/System/Dto/LoginBodyDto.cs b/ZR.Model/System/Dto/LoginBodyDto.cs
index 6bb2246..d5f2a66 100644
--- a/ZR.Model/System/Dto/LoginBodyDto.cs
+++ b/ZR.Model/System/Dto/LoginBodyDto.cs
@@ -16,14 +16,14 @@ namespace ZR.Model.System.Dto
[Required(ErrorMessage = "密码不能为空")]
public string Password { get; set; }
- /**
- * 验证码
- */
+ ///
+ /// 验证码
+ ///
public string Code { get; set; }
- /**
- * 唯一标识
- */
+ ///
+ /// 唯一标识
+ ///
public string Uuid { get; set; } = "";
public string LoginIP { get; set; }
}
diff --git a/ZR.Model/System/Dto/RegisterDto.cs b/ZR.Model/System/Dto/RegisterDto.cs
index 36898f4..53755ff 100644
--- a/ZR.Model/System/Dto/RegisterDto.cs
+++ b/ZR.Model/System/Dto/RegisterDto.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using System.ComponentModel.DataAnnotations;
namespace ZR.Model.System.Dto
{
@@ -20,14 +17,18 @@ namespace ZR.Model.System.Dto
public string Password { get; set; }
[Required(ErrorMessage = "确认密码不能为空")]
public string ConfirmPassword { get; set; }
- /**
- * 验证码
- */
+ ///
+ /// 验证码
+ ///
public string Code { get; set; }
- /**
- * 唯一标识
- */
+ ///
+ /// 唯一标识
+ ///
public string Uuid { get; set; } = "";
+ ///
+ /// 头像
+ ///
+ public string Photo { get; set; }
}
}
diff --git a/ZR.Model/System/Dto/RoleUserDto.cs b/ZR.Model/System/Dto/RoleUserDto.cs
index 44e4ba5..a336289 100644
--- a/ZR.Model/System/Dto/RoleUserDto.cs
+++ b/ZR.Model/System/Dto/RoleUserDto.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
-using System.Text;
namespace ZR.Model.System.Dto
{
@@ -15,18 +13,14 @@ namespace ZR.Model.System.Dto
public class RoleUsersCreateDto
{
///
- /// 描述 : 角色id
- /// 空值 : False
- /// 默认 :
+ /// 角色id
///
[Display(Name = "角色id")]
[Required(ErrorMessage = "roleId 不能为空")]
public long RoleId { get; set; }
///
- /// 描述 : 用户编码 [1,2,3,4]
- /// 空值 : False
- /// 默认 :
+ /// 用户编码 [1,2,3,4]
///
[Display(Name = "用户编码 [1,2,3,4]")]
public List UserIds { get; set; }
diff --git a/ZR.Model/System/Dto/SysFileQueryDto.cs b/ZR.Model/System/Dto/SysFileQueryDto.cs
index b251f1e..40e4f95 100644
--- a/ZR.Model/System/Dto/SysFileQueryDto.cs
+++ b/ZR.Model/System/Dto/SysFileQueryDto.cs
@@ -1,6 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System.Dto
{
@@ -19,48 +17,39 @@ namespace ZR.Model.System.Dto
///
public string FileType { get; set; }
///
- /// 描述 : 存储文件名
- /// 空值 : true
+ /// 存储文件名
///
public string FileName { get; set; }
///
- /// 描述 : 文件存储地址 eg:/uploads/20220202
- /// 空值 : true
+ /// 文件存储地址 eg:/uploads/20220202
///
public string FileUrl { get; set; }
///
- /// 描述 : 仓库位置 eg:/uploads
- /// 空值 : true
+ /// 仓库位置 eg:/uploads
///
public string StorePath { get; set; }
///
- /// 描述 : 文件大小
- /// 空值 : true
+ /// 文件大小
///
public string FileSize { get; set; }
///
- /// 描述 : 文件扩展名
- /// 空值 : true
+ /// 文件扩展名
///
public string FileExt { get; set; }
///
- /// 描述 : 创建人
- /// 空值 : true
+ /// 创建人
///
public string Create_by { get; set; }
///
- /// 描述 : 上传时间
- /// 空值 : true
+ /// 上传时间
///
public DateTime? Create_time { get; set; }
///
- /// 描述 : 存储类型
- /// 空值 : true
+ /// 存储类型
///
public int? StoreType { get; set; }
///
- /// 描述 : 访问路径
- /// 空值 : true
+ /// 访问路径
///
public string AccessUrl { get; set; }
diff --git a/ZR.Model/System/Dto/SysLogininfoDto.cs b/ZR.Model/System/Dto/SysLogininfoDto.cs
index a125b9a..54d4a18 100644
--- a/ZR.Model/System/Dto/SysLogininfoDto.cs
+++ b/ZR.Model/System/Dto/SysLogininfoDto.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ZR.Model.System;
-
-namespace ZR.Model.System.Dto
+namespace ZR.Model.System.Dto
{
public class SysLogininfoDto : SysBase
{
- public int pageNum { get; set; }
+ public int PageNum { get; set; }
///
/// IP 地址
///
diff --git a/ZR.Model/System/Dto/SysNoticeDto.cs b/ZR.Model/System/Dto/SysNoticeDto.cs
index eb1ec16..26e23d9 100644
--- a/ZR.Model/System/Dto/SysNoticeDto.cs
+++ b/ZR.Model/System/Dto/SysNoticeDto.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-using ZR.Model.Models;
-
namespace ZR.Model.System.Dto
{
///
diff --git a/ZR.Model/System/Dto/SysRoleDto.cs b/ZR.Model/System/Dto/SysRoleDto.cs
index 5a29195..241756d 100644
--- a/ZR.Model/System/Dto/SysRoleDto.cs
+++ b/ZR.Model/System/Dto/SysRoleDto.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ZR.Model.System;
+using System.Collections.Generic;
namespace ZR.Model.System.Dto
{
- public class SysRoleDto: SysBase
+ public class SysRoleDto : SysBase
{
public long RoleId { get; set; }
///
diff --git a/ZR.Model/System/Dto/SysUserDto.cs b/ZR.Model/System/Dto/SysUserDto.cs
index 6841ef6..771d501 100644
--- a/ZR.Model/System/Dto/SysUserDto.cs
+++ b/ZR.Model/System/Dto/SysUserDto.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ZR.Model.System;
-
-namespace ZR.Model.System.Dto
+namespace ZR.Model.System.Dto
{
public class SysUserDto
{
@@ -14,7 +9,7 @@ namespace ZR.Model.System.Dto
public string Remark { get; set; }
public string Phonenumber { get; set; }
///
- /// '用户性别(0男 1女 2未知)',
+ /// 用户性别(0男 1女 2未知)
///
public int Sex { get; set; }
}
diff --git a/ZR.Model/System/Dto/SysdictDataDto.cs b/ZR.Model/System/Dto/SysdictDataDto.cs
index e17cf2d..471a3f8 100644
--- a/ZR.Model/System/Dto/SysdictDataDto.cs
+++ b/ZR.Model/System/Dto/SysdictDataDto.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
namespace ZR.Model.System.Dto
{
diff --git a/ZR.Model/System/Dto/TasksDto.cs b/ZR.Model/System/Dto/TasksDto.cs
index fb3a0b4..67fea86 100644
--- a/ZR.Model/System/Dto/TasksDto.cs
+++ b/ZR.Model/System/Dto/TasksDto.cs
@@ -1,16 +1,12 @@
using System;
-using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
-using System.Text;
namespace ZR.Model.System.Dto
{
public class TasksQueryDto
{
///
- /// 描述 : 查询字符串
- /// 空值 : False
- /// 默认 :
+ /// 查询字符串
///
[Display(Name = "查询字符串")]
public string QueryText { get; set; }
@@ -24,102 +20,76 @@ namespace ZR.Model.System.Dto
public class TasksCreateDto
{
///
- /// 描述 : 任务id
- /// 空值 : False
- /// 默认 :
+ /// 任务id
///
[Display(Name = "任务id")]
//[Required(ErrorMessage = "任务不能为空")]
public string ID { get; set; }
///
- /// 描述 : 任务名称
- /// 空值 : False
- /// 默认 :
+ /// 任务名称
///
[Display(Name = "任务名称")]
[Required(ErrorMessage = "任务名称不能为空")]
public string Name { get; set; }
///
- /// 描述 : 任务分组
- /// 空值 : False
- /// 默认 :
+ /// 任务分组
///
[Display(Name = "任务分组")]
[Required(ErrorMessage = "任务分组不能为空")]
public string JobGroup { get; set; }
///
- /// 描述 : 运行时间表达式
- /// 空值 : False
- /// 默认 :
+ /// 运行时间表达式
///
[Display(Name = "运行时间表达式")]
public string Cron { get; set; }
///
- /// 描述 : 程序集名称
- /// 空值 : False
- /// 默认 :
+ /// 程序集名称
///
[Display(Name = "程序集名称")]
- //[Required(ErrorMessage = "程序集名称不能为空")]
public string AssemblyName { get; set; }
///
- /// 描述 : 任务所在类
- /// 空值 : False
- /// 默认 :
+ /// 任务所在类
///
[Display(Name = "任务所在类")]
- //[Required(ErrorMessage = "任务所在类不能为空")]
public string ClassName { get; set; }
///
- /// 描述 : 任务描述
- /// 空值 : True
- /// 默认 :
+ /// 任务描述
///
[Display(Name = "任务描述")]
public string Remark { get; set; }
///
- /// 描述 : 开始时间
- /// 空值 : True
- /// 默认 :
+ /// 开始时间
///
[Display(Name = "开始时间")]
public DateTime? BeginTime { get; set; }
///
- /// 描述 : 结束时间
- /// 空值 : True
- /// 默认 :
+ /// 结束时间
///
[Display(Name = "结束时间")]
public DateTime? EndTime { get; set; }
///
- /// 描述 : 触发器类型(0、simple 1、cron)
- /// 空值 : False
- /// 默认 :
+ /// 触发器类型(0、simple 1、cron)
///
[Display(Name = "触发器类型(0、simple 1、cron)")]
public int TriggerType { get; set; }
///
- /// 描述 : 执行间隔时间(单位:秒)
- /// 空值 : False
- /// 默认 : 0
+ /// 执行间隔时间(单位:秒)
///
[Display(Name = "执行间隔时间(单位:秒)")]
public int IntervalSecond { get; set; }
///
- /// 描述 : 传入参数
- /// 空值 : True
- /// 默认 :
+ /// 传入参数
///
[Display(Name = "传入参数")]
public string JobParams { get; set; }
@@ -128,6 +98,9 @@ namespace ZR.Model.System.Dto
/// 1、程序集任务 2、apiUrl任务 3、SQL语句
///
public int TaskType { get; set; }
+ ///
+ /// SQL文本
+ ///
public string SqlText { get; set; }
///
diff --git a/ZR.Model/System/Dto/TasksLogDto.cs b/ZR.Model/System/Dto/TasksLogDto.cs
index 0284234..2567dc7 100644
--- a/ZR.Model/System/Dto/TasksLogDto.cs
+++ b/ZR.Model/System/Dto/TasksLogDto.cs
@@ -1,17 +1,12 @@
using System;
-using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System.Dto
{
public class TasksLogQueryDto
{
///
- /// 描述 : 查询字符串
- /// 空值 : False
- /// 默认 :
+ /// 查询字符串
///
- //[Display(Name = "查询字符串")]
public string Name{ get; set; }
public string JobName { get; set; }
public string JobId { get; set; }
diff --git a/ZR.Model/System/Generate/GenTable.cs b/ZR.Model/System/Generate/GenTable.cs
index c4ad3d4..cde1f43 100644
--- a/ZR.Model/System/Generate/GenTable.cs
+++ b/ZR.Model/System/Generate/GenTable.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
namespace ZR.Model.System.Generate
{
diff --git a/ZR.Model/System/LoginUser.cs b/ZR.Model/System/LoginUser.cs
index 013a9d1..4ded62a 100644
--- a/ZR.Model/System/LoginUser.cs
+++ b/ZR.Model/System/LoginUser.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
-using System.Text;
namespace ZR.Model.System
{
diff --git a/ZR.Model/System/SysConfig.cs b/ZR.Model/System/SysConfig.cs
index 3ecb688..c253b36 100644
--- a/ZR.Model/System/SysConfig.cs
+++ b/ZR.Model/System/SysConfig.cs
@@ -1,46 +1,38 @@
using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System
{
///
/// 参数配置,数据实体对象
///
- /// @author zhaorui
+ /// @author mr.zhao
/// @date 2021-09-29
///
[SugarTable("sys_config")]
[Tenant("0")]
- public class SysConfig: SysBase
+ public class SysConfig : SysBase
{
///
- /// 描述 :
- /// 空值 :False
+ /// 配置id
///
- [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int ConfigId { get; set; }
///
- /// 描述 :
- /// 空值 :True
+ /// 参数名称
///
public string ConfigName { get; set; }
///
- /// 描述 :
- /// 空值 :True
+ /// 参数键名
///
public string ConfigKey { get; set; }
///
- /// 描述 :
- /// 空值 :True
+ /// 参数键值
///
public string ConfigValue { get; set; }
///
- /// 描述 :
- /// 空值 :True
+ /// 系统内置(Y是 N否)
///
public string ConfigType { get; set; }
-
+
}
}
diff --git a/ZR.Model/System/SysDept.cs b/ZR.Model/System/SysDept.cs
index 5f15151..b38e3af 100644
--- a/ZR.Model/System/SysDept.cs
+++ b/ZR.Model/System/SysDept.cs
@@ -1,7 +1,5 @@
using SqlSugar;
-using System;
using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System
{
@@ -12,32 +10,50 @@ namespace ZR.Model.System
[Tenant("0")]
public class SysDept: SysBase
{
- /** 部门ID */
+ ///
+ /// 部门ID
+ ///
[SqlSugar.SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
public long DeptId { get; set; }
- /** 父部门ID */
+ ///
+ /// 父部门ID
+ ///
public long ParentId { get; set; }
- /** 祖级列表 */
+ ///
+ /// 祖级列表
+ ///
public string Ancestors { get; set; }
- /** 部门名称 */
+ ///
+ /// 部门名称
+ ///
public string DeptName { get; set; }
- /** 显示顺序 */
+ ///
+ /// 显示顺序
+ ///
public int OrderNum { get; set; }
- /** 负责人 */
+ ///
+ /// 负责人
+ ///
public string Leader { get; set; }
- /** 联系电话 */
+ ///
+ /// 联系电话
+ ///
public string Phone { get; set; }
- /** 邮箱 */
+ ///
+ /// 邮箱
+ ///
public string Email { get; set; }
- /** 部门状态:0正常,1停用 */
+ ///
+ /// 部门状态:0正常,1停用
+ ///
public string Status { get; set; }
///
@@ -46,10 +62,6 @@ namespace ZR.Model.System
[SugarColumn(IsOnlyIgnoreInsert = true)]
public string DelFlag { get; set; }
- /** 父部门名称 */
- //[SugarColumn(IsIgnore = true)]
- //public string ParentName { get; set; }
-
///
/// 子菜单
///
diff --git a/ZR.Model/System/SysDictData.cs b/ZR.Model/System/SysDictData.cs
index a2baabc..d11ad44 100644
--- a/ZR.Model/System/SysDictData.cs
+++ b/ZR.Model/System/SysDictData.cs
@@ -7,20 +7,44 @@ namespace ZR.Model.System
///
[Tenant("0")]
[SugarTable("sys_dict_data")]
- public class SysDictData: SysBase
+ public class SysDictData : SysBase
{
///
- /// 字典主键
+ /// 字典编码
///
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
- public long DictCode{ get; set; }
+ public long DictCode { get; set; }
+ ///
+ /// 字典排序
+ ///
public int DictSort { get; set; }
+ ///
+ /// 字典标签
+ ///
public string DictLabel { get; set; }
+ ///
+ /// 字典键值
+ ///
public string DictValue { get; set; }
+ ///
+ /// 字典类型
+ ///
public string DictType { get; set; }
+ ///
+ /// 样式属性(其他样式扩展)
+ ///
public string CssClass { get; set; } = string.Empty;
+ ///
+ /// 表格回显样式
+ ///
public string ListClass { get; set; } = string.Empty;
+ ///
+ /// 是否默认(Y是 N否)
+ ///
public string IsDefault { get; set; }
+ ///
+ /// 状态(0正常 1停用)
+ ///
public string Status { get; set; }
}
}
diff --git a/ZR.Model/System/SysFile.cs b/ZR.Model/System/SysFile.cs
index f066265..5c18651 100644
--- a/ZR.Model/System/SysFile.cs
+++ b/ZR.Model/System/SysFile.cs
@@ -9,8 +9,7 @@ namespace ZR.Model.System
public class SysFile
{
///
- /// 描述 : 自增id
- /// 空值 : false
+ /// 自增id
///
[JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(IsPrimaryKey = true)]
@@ -24,48 +23,39 @@ namespace ZR.Model.System
///
public string FileType { get; set; }
///
- /// 描述 : 存储文件名
- /// 空值 : true
+ /// 存储文件名
///
public string FileName { get; set; }
///
- /// 描述 : 文件存储地址 eg:/uploads/20220202
- /// 空值 : true
+ /// 文件存储地址 eg:/uploads/20220202
///
public string FileUrl { get; set; }
///
- /// 描述 : 仓库位置 eg:/uploads
- /// 空值 : true
+ /// 仓库位置 eg:/uploads
///
public string StorePath { get; set; }
///
- /// 描述 : 文件大小
- /// 空值 : true
+ /// 文件大小
///
public string FileSize { get; set; }
///
- /// 描述 : 文件扩展名
- /// 空值 : true
+ /// 文件扩展名
///
public string FileExt { get; set; }
///
- /// 描述 : 创建人
- /// 空值 : true
+ /// 创建人
///
public string Create_by { get; set; }
///
- /// 描述 : 上传时间
- /// 空值 : true
+ /// 上传时间
///
public DateTime? Create_time { get; set; }
///
- /// 描述 : 存储类型
- /// 空值 : true
+ /// 存储类型
///
public int? StoreType { get; set; }
///
- /// 描述 : 访问路径
- /// 空值 : true
+ /// 访问路径
///
public string AccessUrl { get; set; }
diff --git a/ZR.Model/System/SysLogininfor.cs b/ZR.Model/System/SysLogininfor.cs
index 9c0889e..4cdc074 100644
--- a/ZR.Model/System/SysLogininfor.cs
+++ b/ZR.Model/System/SysLogininfor.cs
@@ -10,7 +10,6 @@ namespace ZR.Model.System
[Tenant("0")]
public class SysLogininfor
{
- //[Key]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public long InfoId { get; set; }
@@ -39,8 +38,9 @@ namespace ZR.Model.System
///
public string Browser { get; set; }
- /** 操作系统 */
- //@Excel(name = "操作系统")
+ ///
+ /// 操作系统
+ ///
public string Os { get; set; }
///
diff --git a/ZR.Model/System/SysMenu.cs b/ZR.Model/System/SysMenu.cs
index 6613e0a..8edfc50 100644
--- a/ZR.Model/System/SysMenu.cs
+++ b/ZR.Model/System/SysMenu.cs
@@ -13,7 +13,6 @@ namespace ZR.Model.System
///
/// 菜单ID
///
- //[Key]//非自动增长主键时使用ExplicitKey
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public long MenuId { get; set; }
///
diff --git a/ZR.Model/System/SysNotice.cs b/ZR.Model/System/SysNotice.cs
index af00410..accf568 100644
--- a/ZR.Model/System/SysNotice.cs
+++ b/ZR.Model/System/SysNotice.cs
@@ -13,32 +13,27 @@ namespace ZR.Model.System
public class SysNotice : SysBase
{
///
- /// 描述 : 公告ID
- /// 空值 : true
+ /// 公告ID
///
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "notice_id")]
public int NoticeId { get; set; }
///
- /// 描述 : 公告标题
- /// 空值 : true
+ /// 公告标题
///
[SugarColumn(ColumnName = "notice_title")]
public string NoticeTitle { get; set; }
///
- /// 描述 : 公告类型 (1通知 2公告)
- /// 空值 : true
+ /// 公告类型 (1通知 2公告)
///
[SugarColumn(ColumnName = "notice_type")]
public string NoticeType { get; set; }
///
- /// 描述 : 公告内容
- /// 空值 : true
+ /// 公告内容
///
[SugarColumn(ColumnName = "notice_content")]
public string NoticeContent { get; set; }
///
- /// 描述 : 公告状态 (0正常 1关闭)
- /// 空值 : true
+ /// 公告状态 (0正常 1关闭)
///
public string Status { get; set; }
}
diff --git a/ZR.Model/System/SysOperLog.cs b/ZR.Model/System/SysOperLog.cs
index d0ae9fb..9929ffb 100644
--- a/ZR.Model/System/SysOperLog.cs
+++ b/ZR.Model/System/SysOperLog.cs
@@ -42,40 +42,52 @@ namespace ZR.Model.System
[DisplayName("请求方式")]
public string RequestMethod { get; set; }
- /** 操作类别(0其它 1后台用户 2手机端用户) */
+ ///
+ /// 操作类别(0其它 1后台用户 2手机端用户)
+ ///
//@Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
[DisplayName("操作类别")]
public int OperatorType { get; set; }
- /** 操作人员 */
+ ///
+ /// 操作人员
+ ///
[DisplayName("操作人员")]
public string OperName { get; set; }
- /** 部门名称 */
- //[DisplayName("部门名称")]
- //public string DeptName { get; set; }
-
- /** 请求url */
+ ///
+ /// 请求url
+ ///
[DisplayName("请求地址")]
public string OperUrl { get; set; }
- /** 操作地址 */
+ ///
+ /// 操作地址
+ ///
[DisplayName("操作地址")]
public string OperIp { get; set; }
- /** 操作地点 */
+ ///
+ /// 操作地点
+ ///
[DisplayName("操作地点")]
public string OperLocation { get; set; }
- /** 请求参数 */
+ ///
+ /// 请求参数
+ ///
[DisplayName("请求参数")]
public string OperParam { get; set; }
- /** 返回参数 */
+ ///
+ /// 返回参数
+ ///
[DisplayName("返回结果")]
public string JsonResult { get; set; }
- /** 操作状态(0正常 1异常) */
+ ///
+ /// 操作状态(0正常 1异常)
+ ///
[DisplayName("状态")]
public int Status { get; set; }
diff --git a/ZR.Model/System/SysRole.cs b/ZR.Model/System/SysRole.cs
index 76d588d..478b567 100644
--- a/ZR.Model/System/SysRole.cs
+++ b/ZR.Model/System/SysRole.cs
@@ -1,8 +1,4 @@
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using SqlSugar;
namespace ZR.Model.System
{
diff --git a/ZR.Model/System/SysRoleDept.cs b/ZR.Model/System/SysRoleDept.cs
index 598fd37..bbe4a96 100644
--- a/ZR.Model/System/SysRoleDept.cs
+++ b/ZR.Model/System/SysRoleDept.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
{
[SqlSugar.SugarTable("sys_role_dept")]
[SqlSugar.Tenant(0)]
diff --git a/ZR.Model/System/SysRoleMenu.cs b/ZR.Model/System/SysRoleMenu.cs
index f1d7bef..ba32d30 100644
--- a/ZR.Model/System/SysRoleMenu.cs
+++ b/ZR.Model/System/SysRoleMenu.cs
@@ -1,8 +1,6 @@
using Newtonsoft.Json;
using SqlSugar;
using System;
-using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System
{
diff --git a/ZR.Model/System/SysRolePost.cs b/ZR.Model/System/SysRolePost.cs
index a9bf406..d0cee95 100644
--- a/ZR.Model/System/SysRolePost.cs
+++ b/ZR.Model/System/SysRolePost.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using SqlSugar;
+using SqlSugar;
namespace ZR.Model.System
{
diff --git a/ZR.Model/System/SysTasks.cs b/ZR.Model/System/SysTasks.cs
index 150ca66..1609a5e 100644
--- a/ZR.Model/System/SysTasks.cs
+++ b/ZR.Model/System/SysTasks.cs
@@ -17,9 +17,7 @@ namespace ZR.Model.System
}
///
- /// 描述 : 任务id
- /// 空值 : False
- /// 默认 :
+ /// 任务id
///
[Display(Name = "任务id")]
//[JsonConverter(typeof(ValueToStringConverter))]
@@ -27,104 +25,82 @@ namespace ZR.Model.System
public string ID { get; set; }
///
- /// 描述 : 任务名称
- /// 空值 : False
- /// 默认 :
+ /// 任务名称
///
[Display(Name = "任务名称")]
public string Name { get; set; }
///
- /// 描述 : 任务分组
- /// 空值 : False
- /// 默认 :
+ /// 任务分组
///
[Display(Name = "任务分组")]
public string JobGroup { get; set; }
///
- /// 描述 : 运行时间表达式
- /// 空值 : False
- /// 默认 :
+ /// 运行时间表达式
///
[Display(Name = "运行时间表达式")]
public string Cron { get; set; }
///
- /// 描述 : 程序集名称
- /// 空值 : False
- /// 默认 :
+ /// 程序集名称
///
[Display(Name = "程序集名称")]
public string AssemblyName { get; set; }
///
- /// 描述 : 任务所在类
- /// 空值 : False
- /// 默认 :
+ /// 任务所在类
///
[Display(Name = "任务所在类")]
public string ClassName { get; set; }
///
- /// 描述 : 任务描述
- /// 空值 : True
- /// 默认 :
+ /// 任务描述
///
[Display(Name = "任务描述")]
public string Remark { get; set; }
///
- /// 描述 : 执行次数
- /// 空值 : False
- /// 默认 : 0
+ /// 执行次数
///
[Display(Name = "执行次数")]
public int RunTimes { get; set; }
///
- /// 描述 : 开始时间
- /// 空值 : True
- /// 默认 :
+ /// 开始时间
///
[Display(Name = "开始时间")]
public DateTime? BeginTime { get; set; }
///
- /// 描述 : 结束时间
- /// 空值 : True
- /// 默认 :
+ /// 结束时间
///
[Display(Name = "结束时间")]
public DateTime? EndTime { get; set; }
///
- /// 描述 : 触发器类型(0、simple 1、cron)
- /// 空值 : False
+ /// 触发器类型(0、simple 1、cron)
/// 默认 : 1
///
[Display(Name = "触发器类型(0、simple 1、cron)")]
public int TriggerType { get; set; }
///
- /// 描述 : 执行间隔时间(单位:秒)
- /// 空值 : False
+ /// 执行间隔时间(单位:秒)
/// 默认 : 0
///
[Display(Name = "执行间隔时间(单位:秒)")]
public int IntervalSecond { get; set; }
///
- /// 描述 : 是否启动
- /// 空值 : False
+ /// 是否启动
/// 默认 : 0
///
[Display(Name = "是否启动")]
public bool IsStart { get; set; }
///
- /// 描述 : 传入参数
- /// 空值 : True
+ /// 传入参数
/// 默认 :
///
[Display(Name = "传入参数")]
@@ -135,9 +111,7 @@ namespace ZR.Model.System
public string Create_by { get; set; }
///
- /// 描述 : 创建时间
- /// 空值 : False
- /// 默认 :
+ /// 创建时间
///
//[Display(Name = "创建时间")]
[SugarColumn(IsOnlyIgnoreUpdate = true)]//设置后修改不会有此字段
diff --git a/ZR.Model/System/SysUser.cs b/ZR.Model/System/SysUser.cs
index 3a60cb7..e65c9b7 100644
--- a/ZR.Model/System/SysUser.cs
+++ b/ZR.Model/System/SysUser.cs
@@ -3,7 +3,6 @@ using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System
{
@@ -19,16 +18,19 @@ namespace ZR.Model.System
///
[SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
public long UserId { get; set; }
- //[Duplication]//校验模板类该列数据是否重复
+ ///
+ /// 登录用户名
+ ///
public string UserName { get; set; }
+ ///
+ /// 用户昵称
+ ///
public string NickName { get; set; }
///
- /// '用户类型(00系统用户)',
+ /// 用户类型(00系统用户)
///
- //[JsonProperty(propertyName: "userType")]
- //public string User_type { get; set; } = "";
- [SugarColumn(IsOnlyIgnoreInsert = true)]
- [ExcelIgnore]
+ public string UserType { get; set; } = "";
+ //[SugarColumn(IsOnlyIgnoreInsert = true)]
public string Avatar { get; set; }
public string Email { get; set; }
diff --git a/ZR.Model/System/SysUserPost.cs b/ZR.Model/System/SysUserPost.cs
index 67847dd..e58c2f1 100644
--- a/ZR.Model/System/SysUserPost.cs
+++ b/ZR.Model/System/SysUserPost.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using SqlSugar;
+using SqlSugar;
namespace ZR.Model.System
{
-
///
/// 用户岗位
///
diff --git a/ZR.Model/System/SysUserRole.cs b/ZR.Model/System/SysUserRole.cs
index 78f6334..fab8cfd 100644
--- a/ZR.Model/System/SysUserRole.cs
+++ b/ZR.Model/System/SysUserRole.cs
@@ -1,21 +1,18 @@
using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System
{
///
/// 用户角色关联表 用户N-1 角色
///
- [SqlSugar.SugarTable("sys_user_role")]
+ [SugarTable("sys_user_role")]
[Tenant("0")]
public class SysUserRole
{
- [SqlSugar.SugarColumn(ColumnName = "user_id", IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "user_id", IsPrimaryKey = true)]
public long UserId { get; set; }
- [SqlSugar.SugarColumn(ColumnName = "role_id", IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "role_id", IsPrimaryKey = true)]
public long RoleId { get; set; }
}
}
diff --git a/ZR.Model/System/UserConstants.cs b/ZR.Model/System/UserConstants.cs
index b2f8a4b..a944b6e 100644
--- a/ZR.Model/System/UserConstants.cs
+++ b/ZR.Model/System/UserConstants.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ZR.Model.System
+namespace ZR.Model.System
{
public class UserConstants
{
diff --git a/ZR.Model/System/Vo/LangVo.cs b/ZR.Model/System/Vo/LangVo.cs
deleted file mode 100644
index 802d842..0000000
--- a/ZR.Model/System/Vo/LangVo.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ZR.Model.System.Vo
-{
- public class LangVo
- {
-
- }
-}
diff --git a/ZR.Model/System/Vo/RouterVo.cs b/ZR.Model/System/Vo/RouterVo.cs
index 30f982c..e0756c2 100644
--- a/ZR.Model/System/Vo/RouterVo.cs
+++ b/ZR.Model/System/Vo/RouterVo.cs
@@ -1,7 +1,5 @@
using Newtonsoft.Json;
-using System;
using System.Collections.Generic;
-using System.Text;
namespace ZR.Model.System.Vo
{
diff --git a/ZR.Model/System/Vo/TreeSelectVo.cs b/ZR.Model/System/Vo/TreeSelectVo.cs
index 01bbe3b..b002e44 100644
--- a/ZR.Model/System/Vo/TreeSelectVo.cs
+++ b/ZR.Model/System/Vo/TreeSelectVo.cs
@@ -1,8 +1,5 @@
using Newtonsoft.Json;
-using System;
using System.Collections.Generic;
-using System.Text;
-using ZR.Model.System;
namespace ZR.Model.System.Vo
{
diff --git a/ZR.Service/System/IService/ISysConfigService.cs b/ZR.Service/System/IService/ISysConfigService.cs
index 94ac407..ba8ddec 100644
--- a/ZR.Service/System/IService/ISysConfigService.cs
+++ b/ZR.Service/System/IService/ISysConfigService.cs
@@ -6,7 +6,7 @@ namespace ZR.Service.System.IService
///
/// 参数配置service接口
///
- /// @author zhaorui
+ /// @author mr.zhao
/// @date 2021-09-29
///
public interface ISysConfigService : IBaseService