diff --git a/.gitignore b/.gitignore index 34b14f9..be46788 100644 --- a/.gitignore +++ b/.gitignore @@ -259,7 +259,11 @@ paket-files/ # Python Tools for Visual Studio (PTVS) __pycache__/ *.pyc -/ZRAdmin/Properties/launchSettings.json -/ZRAdmin/Properties/PublishProfiles /ZR.Admin.WebApi/appsettings.Stage.json /CodeGenerate +/ZR.Admin.WebApi/appsettings.Production.json +/ZR.Admin.WebApi/wwwroot/uploads +/ZR.Admin.WebApi/wwwroot/Generatecode +/ZR.Admin.WebApi/wwwroot/export +/ZR.Vue/src/views/business/Gendemo.vue +/ZR.Admin.WebApi/Properties/launchSettings.json diff --git a/Infrastructure/ConfigUtils.cs b/Infrastructure/ConfigUtils.cs index 617875d..c733a9e 100644 --- a/Infrastructure/ConfigUtils.cs +++ b/Infrastructure/ConfigUtils.cs @@ -14,7 +14,7 @@ namespace Infrastructure static ConfigUtils() { - Config = App.ServiceProvider.GetRequiredService(); + Configuration = App.ServiceProvider.GetRequiredService(); if (Instance == null) Instance = new ConfigUtils(); @@ -22,35 +22,22 @@ namespace Infrastructure public static ConfigUtils Instance { get; private set; } #endregion - - private static IConfiguration Config { get; set; } - - /// - /// 泛型读取配置文件 - /// 目前还不能绑定到实体类 - /// - /// 获取不到配置文件设定默认值 - /// 要获取的配置文件节点名称 - /// - //public T GetConfig(string key, T defaultValue = default) - //{ - // //GetValue扩展包需要安装Microsoft.Extensions.Configuration - // var setting = Config.GetValue(key, defaultValue); - - // Console.WriteLine($"获取配置文件值key={key},value={setting}"); - // return setting; - //} + private static IConfiguration Configuration { get; set; } public T GetAppConfig(string key, T defaultValue = default(T)) { - T setting = (T)Convert.ChangeType(Config[key], typeof(T)); + T setting = (T)Convert.ChangeType(Configuration[key], typeof(T)); var value = setting; if (setting == null) value = defaultValue; - //Console.WriteLine($"获取配置文件值key={key},value={value}"); return value; } - + public T Bind(string key, T t) + { + Configuration.Bind(key, t); + + return t; + } /// /// 获取配置文件 /// @@ -58,7 +45,7 @@ namespace Infrastructure /// public string GetConfig(string key) { - return Config[key]; + return Configuration[key]; } /// @@ -66,10 +53,9 @@ namespace Infrastructure /// /// /// - public string GetConnectionStrings(string key) + public string GetConnectionString(string key) { - return Config.GetConnectionString(key); - + return Configuration.GetConnectionString(key); } } } diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj index d878cb3..2884497 100644 --- a/Infrastructure/Infrastructure.csproj +++ b/Infrastructure/Infrastructure.csproj @@ -4,6 +4,10 @@ net5.0 + + + + diff --git a/Infrastructure/OptionsSetting.cs b/Infrastructure/OptionsSetting.cs index 7833a53..dc36620 100644 --- a/Infrastructure/OptionsSetting.cs +++ b/Infrastructure/OptionsSetting.cs @@ -50,4 +50,27 @@ namespace Infrastructure public string KEY { get; set; } public string SECRET { get; set; } } + + /// + /// Jwt + /// + public class JwtSettings + { + /// + /// token是谁颁发的 + /// + public string Issuer { get; set; } + /// + /// token可以给那些客户端使用 + /// + public string Audience { get; set; } + /// + /// 加密的key（SecretKey必须大于16个,是大于，不是大于等于） + /// + public string SecretKey { get; set; } + /// + /// token时间（分） + /// + public int Expire { get; set; } = 1440; + } } diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs index f19cc41..b34e50e 100644 --- a/ZR.Admin.WebApi/Controllers/BaseController.cs +++ b/ZR.Admin.WebApi/Controllers/BaseController.cs @@ -9,6 +9,8 @@ using OfficeOpenXml; using System; using System.Collections.Generic; using System.IO; +using System.Linq; +using System.Reflection; using ZR.Admin.WebApi.Filters; namespace ZR.Admin.WebApi.Controllers @@ -120,13 +122,13 @@ namespace ZR.Admin.WebApi.Controllers //调试模式需要加上 ExcelPackage.LicenseContext = LicenseContext.NonCommercial; Directory.CreateDirectory(Path.GetDirectoryName(newFileName)); - using (ExcelPackage package = new ExcelPackage(new FileInfo(newFileName))) + using (ExcelPackage package = new(new FileInfo(newFileName))) { // 添加worksheet ExcelWorksheet worksheet = package.Workbook.Worksheets.Add(sheetName); //全部字段导出 - worksheet.Cells.LoadFromCollection(list, true); + worksheet.Cells.LoadFromCollection(list, true, OfficeOpenXml.Table.TableStyles.Light13); package.Save(); } diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs new file mode 100644 index 0000000..591d78f --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/CommonController.cs @@ -0,0 +1,135 @@ +using Infrastructure; +using Infrastructure.Attribute; +using Infrastructure.Model; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Options; +using Newtonsoft.Json; +using System; +using System.IO; +using System.Linq; +using ZR.Admin.WebApi.Filters; +using ZR.Common; +using ZR.Service.System.IService; + +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 公共模块 + /// + [Route("[controller]/[action]")] + public class CommonController : BaseController + { + private OptionsSetting OptionsSetting; + private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger(); + + private IWebHostEnvironment WebHostEnvironment; + private ISysFileService SysFileService; + public CommonController(IOptions options, IWebHostEnvironment webHostEnvironment, ISysFileService fileService) + { + WebHostEnvironment = webHostEnvironment; + SysFileService = fileService; + OptionsSetting = options.Value; + } + + /// + /// 心跳 + /// + /// + [HttpGet, Route("health/index")] + public IActionResult Health() + { + return SUCCESS(true); + } + + /// + /// 发送邮件 + /// + /// 请求参数接收实体 + /// + [ActionPermissionFilter(Permission = "tool:email:send")] + [Log(Title = "发送邮件", IsSaveRequestData = false)] + [HttpPost] + public IActionResult SendEmail([FromBody] SendEmailDto sendEmailVo) + { + if (sendEmailVo == null || string.IsNullOrEmpty(sendEmailVo.Subject) || string.IsNullOrEmpty(sendEmailVo.ToUser)) + { + return ToResponse(ApiResult.Error($"请求参数不完整")); + } + if (string.IsNullOrEmpty(OptionsSetting.MailOptions.From) || string.IsNullOrEmpty(OptionsSetting.MailOptions.Password)) + { + return ToResponse(ApiResult.Error($"请配置邮箱信息")); + } + MailHelper mailHelper = new MailHelper(OptionsSetting.MailOptions.From, OptionsSetting.MailOptions.Smtp, OptionsSetting.MailOptions.Port, OptionsSetting.MailOptions.Password); + + mailHelper.SendMail(sendEmailVo.ToUser, sendEmailVo.Subject, sendEmailVo.Content, sendEmailVo.FileUrl, sendEmailVo.HtmlContent); + + logger.Info($"发送邮件{JsonConvert.SerializeObject(sendEmailVo)}"); + + return SUCCESS(true); + } + + #region 上传 + + /// + /// 存储文件 + /// + /// + /// + [HttpPost()] + [Verify] + [ActionPermissionFilter(Permission = "system")] + public IActionResult UploadFile([FromForm(Name = "file")] IFormFile formFile) + { + if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传图片不能为空"); + string fileExt = Path.GetExtension(formFile.FileName); + string fileName = FileUtil.HashFileName(Guid.NewGuid().ToString()).ToLower() + fileExt; + string finalFilePath = Path.Combine(WebHostEnvironment.WebRootPath, FileUtil.GetdirPath("uploads"), fileName); + finalFilePath = finalFilePath.Replace("\\", "/").Replace("//", "/"); + + if (!Directory.Exists(Path.GetDirectoryName(finalFilePath))) + { + Directory.CreateDirectory(Path.GetDirectoryName(finalFilePath)); + } + + using (var stream = new FileStream(finalFilePath, FileMode.Create)) + { + formFile.CopyTo(stream); + } + + string accessPath = $"{OptionsSetting.Upload.UploadUrl}/{FileUtil.GetdirPath("uploads").Replace("\\", " /")}{fileName}"; + return ToResponse(ResultCode.SUCCESS, accessPath); + } + + /// + /// 存储文件到阿里云 + /// + /// + /// + [HttpPost] + [Verify] + [ActionPermissionFilter(Permission = "system")] + public IActionResult UploadFileAliyun([FromForm(Name = "file")] IFormFile formFile) + { + if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传文件不能为空"); + string fileExt = Path.GetExtension(formFile.FileName); + string[] AllowedFileExtensions = new string[] { ".jpg", ".gif", ".png", ".jpeg", ".webp", ".svga", ".xls" }; + int MaxContentLength = 1024 * 1024 * 4; + + if (!AllowedFileExtensions.Contains(fileExt)) + { + return ToResponse(ResultCode.CUSTOM_ERROR, "上传失败，未经允许上传类型"); + } + + if (formFile.Length > MaxContentLength) + { + return ToResponse(ResultCode.CUSTOM_ERROR, "上传文件过大，不能超过 " + (MaxContentLength / 1024).ToString() + " MB"); + } + (bool, string) result = SysFileService.SaveFile("", formFile); + + return ToResponse(ResultCode.SUCCESS, result.Item2); + } + #endregion + } +} diff --git a/ZR.Admin.WebApi/Controllers/HomeController.cs b/ZR.Admin.WebApi/Controllers/HomeController.cs deleted file mode 100644 index c670ea5..0000000 --- a/ZR.Admin.WebApi/Controllers/HomeController.cs +++ /dev/null @@ -1,91 +0,0 @@ -using Infrastructure; -using Infrastructure.Attribute; -using Infrastructure.Model; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Options; -using Newtonsoft.Json; -using System; -using ZR.Admin.WebApi.Filters; -using ZR.Common; - -namespace ZR.Admin.WebApi.Controllers -{ - public class HomeController : BaseController - { - private OptionsSetting OptionsSetting; - private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger(); - - public HomeController(IOptions options) - { - OptionsSetting = options.Value; - } - - /// - /// 心跳 - /// - /// - [HttpGet, Route("health/index")] - [Log()] - public IActionResult Health() - { - return SUCCESS(true); - } - - /// - /// 加密 - /// - /// - /// - public IActionResult Encrypt(string content) - { - if (string.IsNullOrEmpty(content)) - { - throw new Exception("content不能为空"); - } - string key = ConfigUtils.Instance.GetConfig("DbKey"); - string encryptTxt = NETCore.Encrypt.EncryptProvider.DESEncrypt(content, key); - return Ok(new { content, encryptTxt }); - } - - /// - /// 解密 - /// - /// - /// - public IActionResult Decrypt(string content) - { - if (string.IsNullOrEmpty(content)) - { - throw new Exception("content不能为空"); - } - string key = ConfigUtils.Instance.GetConfig("DbKey"); - string encryptTxt = NETCore.Encrypt.EncryptProvider.DESDecrypt(content, key); - return Ok(new { content, encryptTxt }); - } - - /// - /// 发送邮件 - /// - /// 请求参数接收实体 - /// - [ActionPermissionFilter(Permission = "tool:email:send")] - public IActionResult SendEmail([FromBody] SendEmailDto sendEmailVo) - { - if (sendEmailVo == null || string.IsNullOrEmpty(sendEmailVo.Subject) || string.IsNullOrEmpty(sendEmailVo.ToUser)) - { - return ToResponse(ApiResult.Error($"请求参数不完整")); - } - if (string.IsNullOrEmpty(OptionsSetting.MailOptions.From) || string.IsNullOrEmpty(OptionsSetting.MailOptions.Password)) - { - return ToResponse(ApiResult.Error($"请配置邮箱信息")); - } - MailHelper mailHelper = new MailHelper(OptionsSetting.MailOptions.From, OptionsSetting.MailOptions.Smtp, OptionsSetting.MailOptions.Port, OptionsSetting.MailOptions.Password); - - mailHelper.SendMail(sendEmailVo.ToUser, sendEmailVo.Subject, sendEmailVo.Content, sendEmailVo.FileUrl, sendEmailVo.HtmlContent); - - logger.Info($"发送邮件{JsonConvert.SerializeObject(sendEmailVo)}"); - - return SUCCESS(true); - } - } -} diff --git a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs index 0466f31..6c993d3 100644 --- a/ZR.Admin.WebApi/Controllers/System/ArticleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/ArticleController.cs @@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Title), m => m.Title.Contains(parm.Title)); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Status), m => m.Status == parm.Status); - var response = _ArticleService.GetPages(predicate.ToExpression(), parm, f => f.Cid, "Desc"); + var response = _ArticleService.GetPages(predicate.ToExpression(), parm, f => f.Cid, OrderByType.Desc); return SUCCESS(response); } diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs similarity index 87% rename from ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs rename to ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index e503f8e..61fc996 100644 --- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -19,7 +19,7 @@ using ZR.Common; using ZR.Model; using ZR.Model.System.Dto; using ZR.Model.System.Generate; -using ZR.Model.Vo; +using ZR.Service; using ZR.Service.System.IService; namespace ZR.Admin.WebApi.Controllers @@ -27,17 +27,24 @@ namespace ZR.Admin.WebApi.Controllers /// /// 代码生成 /// + [Verify] [Route("tool/gen")] public class CodeGeneratorController : BaseController { private CodeGeneraterService _CodeGeneraterService = new CodeGeneraterService(); private IGenTableService GenTableService; private IGenTableColumnService GenTableColumnService; + private readonly ISysDictDataService SysDictDataService; private IWebHostEnvironment WebHostEnvironment; - public CodeGeneratorController(IGenTableService genTableService, IGenTableColumnService genTableColumnService, IWebHostEnvironment webHostEnvironment) + public CodeGeneratorController( + IGenTableService genTableService, + IGenTableColumnService genTableColumnService, + ISysDictDataService dictDataService, + IWebHostEnvironment webHostEnvironment) { GenTableService = genTableService; GenTableColumnService = genTableColumnService; + SysDictDataService = dictDataService; WebHostEnvironment = webHostEnvironment; } @@ -66,43 +73,8 @@ namespace ZR.Admin.WebApi.Controllers public IActionResult FindListTable(string dbName, string tableName, PagerInfo pager) { List list = _CodeGeneraterService.GetAllTables(dbName, tableName, pager); - var vm = new VMPageResult(list, pager); - return SUCCESS(vm); - } - - /// - /// 代码生成器 - /// - /// 数据传输对象 - /// - [HttpPost("genCode")] - [Log(Title = "代码生成", BusinessType = BusinessType.GENCODE)] - [ActionPermissionFilter(Permission = "tool:gen:code")] - public IActionResult Generate([FromBody] GenerateDto dto) - { - if (dto.TableId <= 0) - { - throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空"); - } - dto.ZipPath = Path.Combine(WebHostEnvironment.WebRootPath, "Generatecode"); - dto.GenCodePath = Path.Combine(dto.ZipPath, DateTime.Now.ToString("yyyyMMdd")); - - var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId); - genTableInfo.Columns = GenTableColumnService.GenTableColumns(dto.TableId); - if (!string.IsNullOrEmpty(genTableInfo.Options)) - { - Dictionary options = JsonConvert.DeserializeObject>(genTableInfo.Options); - dto.ParentMenuId = (long)options.GetValueOrDefault("parentMenuId", 0); - } - dto.GenTable = genTableInfo; - //生成代码 - CodeGeneratorTool.Generate(genTableInfo, dto); - //下载文件 - FileHelper.ZipGenCode(dto); - - //HttpContext.Response.Headers.Add("Content-disposition", $"attachment; filename={zipFileName}"); - return SUCCESS(new { zipPath = "/Generatecode/" + dto.ZipFileName, fileName = dto.ZipFileName }); + return SUCCESS(list.ToPage(pager)); } /// @@ -130,7 +102,7 @@ namespace ZR.Admin.WebApi.Controllers { var tableColumns = GenTableColumnService.GenTableColumns(tableId); var tableInfo = GenTableService.GetGenTableInfo(tableId); - return SUCCESS(new { result = tableColumns, info = tableInfo }); + return SUCCESS(new { cloumns = tableColumns, info = tableInfo }); } /// @@ -177,11 +149,11 @@ namespace ZR.Admin.WebApi.Controllers BaseNameSpace = "ZR.",//导入默认命名空间前缀 ModuleName = "business",//导入默认模块名 ClassName = CodeGeneratorTool.GetClassName(tableName), - BusinessName = CodeGeneratorTool.GetClassName(tableName), + BusinessName = CodeGeneratorTool.GetBusinessName(tableName), FunctionAuthor = ConfigUtils.Instance.GetConfig(GenConstants.Gen_author), - FunctionName = string.IsNullOrEmpty(tabInfo.Description) ? tableName : tabInfo.Description, TableName = tableName, - TableComment = string.IsNullOrEmpty(tabInfo.Description) ? tableName : tabInfo.Description, + TableComment = tabInfo?.Description, + FunctionName = tabInfo?.Description, Create_by = userName, }; genTable.TableId = GenTableService.ImportGenTable(genTable); @@ -217,7 +189,12 @@ namespace ZR.Admin.WebApi.Controllers if (genTableDto == null) throw new CustomException("请求参数错误"); var genTable = genTableDto.Adapt().ToUpdate(HttpContext); - genTable.Options = JsonConvert.SerializeObject(new { parentMenuId = genTableDto.ParentMenuId }); + genTable.Options = JsonConvert.SerializeObject(new + { + parentMenuId = genTableDto.ParentMenuId, + sortField = genTableDto.SortField, + sortType = genTable.SortType + }); int rows = GenTableService.UpdateGenTable(genTable); if (rows > 0) { @@ -241,16 +218,52 @@ namespace ZR.Admin.WebApi.Controllers } var genTableInfo = GenTableService.GetGenTableInfo(tableId); genTableInfo.Columns = GenTableColumnService.GenTableColumns(tableId); + + //var dictList = genTableInfo.Columns.FindAll(x => !string.IsNullOrEmpty(x.DictType)); + //foreach (var item in dictList) + //{ + // item.DictDatas = SysDictDataService.SelectDictDataByType(item.DictType); + //} GenerateDto dto = new(); dto.GenTable = genTableInfo; dto.ZipPath = Path.Combine(WebHostEnvironment.WebRootPath, "Generatecode"); dto.GenCodePath = Path.Combine(dto.ZipPath, DateTime.Now.ToString("yyyyMMdd")); dto.IsPreview = 1; - dto.GenCodeFiles = new int[] { 1, 2, 3, 4, 5, 6, 7, 8 }; //生成代码 - CodeGeneratorTool.Generate(genTableInfo, dto); + CodeGeneratorTool.Generate(dto); return SUCCESS(dto.GenCodes); } + + /// + /// 生成代码（下载方式） + /// + /// 数据传输对象 + /// + [HttpPost("genCode")] + [Log(Title = "代码生成", BusinessType = BusinessType.GENCODE)] + [ActionPermissionFilter(Permission = "tool:gen:code")] + public IActionResult Generate([FromBody] GenerateDto dto) + { + if (dto.TableId <= 0) + { + throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空"); + } + dto.ZipPath = Path.Combine(WebHostEnvironment.WebRootPath, "Generatecode"); + dto.GenCodePath = Path.Combine(dto.ZipPath, DateTime.Now.ToString("yyyyMMdd")); + + var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId); + genTableInfo.Columns = GenTableColumnService.GenTableColumns(dto.TableId); + + dto.GenTable = genTableInfo; + //生成代码 + CodeGeneratorTool.Generate(dto); + //下载文件 + FileHelper.ZipGenCode(dto); + + //HttpContext.Response.Headers.Add("Content-disposition", $"attachment; filename={zipFileName}"); + return SUCCESS(new { zipPath = "/Generatecode/" + dto.ZipFileName, fileName = dto.ZipFileName }); + } + } } diff --git a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs index 55425f6..5e47b9d 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs @@ -9,14 +9,13 @@ using Infrastructure.Enums; using Infrastructure.Model; using Mapster; using ZR.Model.Dto; -using ZR.Model.Models; -using ZR.Service.Business; using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Common; using ZR.Service.System; using ZR.Model.System; using Infrastructure.Extensions; +using Microsoft.AspNetCore.Authorization; namespace ZR.Admin.WebApi.Controllers { @@ -83,6 +82,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// [HttpGet("configKey/{configKey}")] + [AllowAnonymous] public IActionResult GetConfigKey(string configKey) { //TODO 增加缓存 @@ -107,7 +107,7 @@ namespace ZR.Admin.WebApi.Controllers //从 Dto 映射到 实体 var model = parm.Adapt().ToCreate(); - return SUCCESS(_SysConfigService.Add(model, it => new + return SUCCESS(_SysConfigService.Insert(model, it => new { it.ConfigName, it.ConfigKey, @@ -144,6 +144,7 @@ namespace ZR.Admin.WebApi.Controllers ConfigType = model.ConfigType, Update_by = model.Update_by, Update_time = model.Update_time, + Remark = model.Remark }); return SUCCESS(response); diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs index c5fe262..86e178b 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs @@ -38,10 +38,8 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpGet("list")] public IActionResult List([FromQuery] SysDictData dictData, [FromQuery] PagerInfo pagerInfo) { - var list = SysDictDataService.SelectDictDataList(dictData); - pagerInfo.TotalNum = list.Count; - var vm = new VMPageResult(list, pagerInfo); - return SUCCESS(vm); + var list = SysDictDataService.SelectDictDataList(dictData, pagerInfo); + return SUCCESS(list); } /// @@ -107,7 +105,7 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpDelete("{dictCode}")] public IActionResult Remove(string dictCode) { - long[] dictCodes = ZR.Common.Tools.SpitLongArrary(dictCode); + long[] dictCodes = Common.Tools.SpitLongArrary(dictCode); return SUCCESS(SysDictDataService.DeleteDictDataByIds(dictCodes)); } diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs index 7efaf3f..1e66890 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -38,8 +38,7 @@ namespace ZR.Admin.WebApi.Controllers.System { var list = SysDictService.SelectDictTypeList(dict, pagerInfo); - var vm = new VMPageResult(list, pagerInfo); - return SUCCESS(vm, TIME_FORMAT_FULL); + return SUCCESS(list, TIME_FORMAT_FULL); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs index 13cfd24..6687616 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -15,6 +15,7 @@ using ZR.Model.System.Dto; using ZR.Service.System.IService; using Hei.Captcha; using ZR.Common; +using ZR.Service.System; namespace ZR.Admin.WebApi.Controllers.System { @@ -30,6 +31,7 @@ namespace ZR.Admin.WebApi.Controllers.System private readonly ISysLoginService sysLoginService; private readonly ISysPermissionService permissionService; private readonly SecurityCodeHelper SecurityCodeHelper; + private readonly ISysConfigService sysConfigService; public SysLoginController( IHttpContextAccessor contextAccessor, @@ -37,6 +39,7 @@ namespace ZR.Admin.WebApi.Controllers.System ISysUserService sysUserService, ISysLoginService sysLoginService, ISysPermissionService permissionService, + ISysConfigService configService, SecurityCodeHelper captcha) { httpContextAccessor = contextAccessor; @@ -45,6 +48,7 @@ namespace ZR.Admin.WebApi.Controllers.System this.sysUserService = sysUserService; this.sysLoginService = sysLoginService; this.permissionService = permissionService; + this.sysConfigService = configService; } @@ -60,7 +64,8 @@ namespace ZR.Admin.WebApi.Controllers.System { if (loginBody == null) { throw new CustomException("请求参数错误"); } loginBody.LoginIP = HttpContextExtension.GetClientUserIp(HttpContext); - if (CacheHelper.Get(loginBody.Uuid) is string str && !str.ToLower().Equals(loginBody.Code.ToLower())) + SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff"); + if (sysConfig?.ConfigValue != "off" && CacheHelper.Get(loginBody.Uuid) is string str && !str.ToLower().Equals(loginBody.Code.ToLower())) { throw new CustomException(ResultCode.CAPTCHA_ERROR, "验证码错误"); } @@ -74,7 +79,7 @@ namespace ZR.Admin.WebApi.Controllers.System #endregion LoginUser loginUser = new LoginUser(user.UserId, user.UserName, roles, permissions); - return SUCCESS(JwtUtil.GenerateJwtToken(HttpContext.WriteCookies(loginUser))); + return SUCCESS(JwtUtil.GenerateJwtToken(HttpContext.AddClaims(loginUser))); } /// @@ -85,11 +90,11 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpPost("logout")] public IActionResult LogOut() { - Task.Run(async () => - { - //注销登录的用户，相当于ASP.NET中的FormsAuthentication.SignOut - await HttpContext.SignOutAsync(); - }).Wait(); + //Task.Run(async () => + //{ + // //注销登录的用户，相当于ASP.NET中的FormsAuthentication.SignOut + // await HttpContext.SignOutAsync(); + //}).Wait(); return SUCCESS(1); } @@ -136,8 +141,26 @@ namespace ZR.Admin.WebApi.Controllers.System public ApiResult CaptchaImage() { string uuid = Guid.NewGuid().ToString().Replace("-", ""); + + SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff"); var code = SecurityCodeHelper.GetRandomEnDigitalText(4); - var imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code); + byte[] imgByte; + if (sysConfig.ConfigValue == "1") + { + imgByte = SecurityCodeHelper.GetGifEnDigitalCodeByte(code);//动态gif数字字母 + } + else if (sysConfig.ConfigValue == "2") + { + imgByte = SecurityCodeHelper.GetGifBubbleCodeByte(code);//动态gif泡泡 + } + else if (sysConfig.ConfigValue == "3") + { + imgByte = SecurityCodeHelper.GetBubbleCodeByte(code);//泡泡 + } + else + { + imgByte = SecurityCodeHelper.GetEnDigitalCodeByte(code);//英文字母加数字 + } string base64Str = Convert.ToBase64String(imgByte); CacheHelper.SetCache(uuid, code); var obj = new { uuid, img = base64Str };// File(stream, "image/png") diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs index 274bd54..bb310ac 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs @@ -120,6 +120,7 @@ namespace ZR.Admin.WebApi.Controllers.System /// /// 修改头像 /// + /// /// [HttpPost("Avatar")] [ActionPermissionFilter(Permission = "system")] @@ -131,7 +132,7 @@ namespace ZR.Admin.WebApi.Controllers.System if (formFile == null) throw new CustomException("请选择文件"); string fileExt = Path.GetExtension(formFile.FileName); - string savePath = Path.Combine("wwwroot", FileUtil.GetdirPath("uploads")); + string savePath = Path.Combine(hostEnvironment.WebRootPath, FileUtil.GetdirPath("uploads")); Console.WriteLine(savePath); if (!Directory.Exists(savePath)) { Directory.CreateDirectory(savePath); } @@ -141,7 +142,7 @@ namespace ZR.Admin.WebApi.Controllers.System using (var stream = new FileStream(finalFilePath, FileMode.Create)) { - formFile.CopyToAsync(stream); + formFile.CopyTo(stream); } string accessUrl = $"{OptionsSetting.Upload.UploadUrl}/{FileUtil.GetdirPath("uploads")}{fileName}"; diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs index 9d333f6..fd2242e 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs @@ -11,7 +11,7 @@ using System.IO; using ZR.Admin.WebApi.Filters; using ZR.Model; using ZR.Model.System; -using ZR.Model.Vo; +using ZR.Service; using ZR.Service.System.IService; namespace ZR.Admin.WebApi.Controllers.System @@ -53,9 +53,7 @@ namespace ZR.Admin.WebApi.Controllers.System { var list = UserService.SelectUserList(user, pager); - var vm = new VMPageResult(list, pager); - - return SUCCESS(vm, TIME_FORMAT_FULL); + return SUCCESS(list.ToPage(pager), TIME_FORMAT_FULL); } /// @@ -220,48 +218,10 @@ namespace ZR.Admin.WebApi.Controllers.System [ActionPermissionFilter(Permission = "system:user:export")] public IActionResult UserExport([FromQuery] SysUser user) { - string sFileName = $"用户列表{DateTime.Now:yyyyMMddHHmmss}.xlsx"; - string newFileName = Path.Combine(WebHostEnvironment.WebRootPath, "export", sFileName); var list = UserService.SelectUserList(user, new PagerInfo(1, 10000)); //调试模式需要加上 - ExcelPackage.LicenseContext = LicenseContext.NonCommercial; - Directory.CreateDirectory(Path.GetDirectoryName(newFileName)); - using (ExcelPackage package = new ExcelPackage(new FileInfo(newFileName))) - { - // 添加worksheet - ExcelWorksheet worksheet = package.Workbook.Worksheets.Add("sysuser"); - #region 自定义导出 - //添加头 - //worksheet.Cells[1, 1].Value = "用户id"; - //worksheet.Cells[1, 2].Value = "用户名称"; - //worksheet.Cells[1, 3].Value = "用户昵称"; - //worksheet.Cells[1, 4].Value = "部门"; - //worksheet.Cells[1, 5].Value = "手机号码"; - //worksheet.Cells[1, 6].Value = "性别"; - //worksheet.Cells[1, 7].Value = "状态"; - //worksheet.Cells[1, 8].Value = "添加时间"; - //worksheet.Cells[1, 9].Value = "登录IP"; - //worksheet.Cells[1, 10].Value = "最后登录时间"; - //for (int i = 0; i < list.Count; i++) - //{ - // var item = list[i]; - // //worksheet.Cells[i + 2, 1].Value = item.UserId; - // //worksheet.Cells[i + 2, 2].Value = item.UserName; - // //worksheet.Cells[i + 2, 3].Value = item.NickName; - // //worksheet.Cells[i + 2, 4].Value = item.DeptName; - // //worksheet.Cells[i + 2, 5].Value = item.Phonenumber; - // //worksheet.Cells[i + 2, 6].Value = item.Sex; - // //worksheet.Cells[i + 2, 7].Value = item.Status; - // //worksheet.Cells[i + 2, 8].Value = item.Create_time.ToString(); - // //worksheet.Cells[i + 2, 9].Value = item.LoginIP; - // //worksheet.Cells[i + 2, 10].Value = item.LoginDate.ToString(); - //} - #endregion - //全部字段导出 - worksheet.Cells.LoadFromCollection(list, true); - package.Save(); - } + string sFileName = ExportExcel(list, "user", "用户列表"); return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName }); } } diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index 4ec1e09..d2d8148 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -20,7 +20,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// 计划任务 /// - //[Verify] + [Verify] [Route("system/Tasks")] public class TasksController : BaseController { @@ -51,7 +51,7 @@ namespace ZR.Admin.WebApi.Controllers m.JobGroup.Contains(parm.QueryText) || m.AssemblyName.Contains(parm.QueryText)); - var response = _tasksQzService.GetPages(predicate.ToExpression(), pager, f => f.IsStart, "Desc"); + var response = _tasksQzService.GetPages(predicate.ToExpression(), pager, f => f.IsStart, OrderByType.Desc); return SUCCESS(response, TIME_FORMAT_FULL); } diff --git a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs index 3ce61dd..867ba3d 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksLogController.cs @@ -13,6 +13,7 @@ using Infrastructure; namespace ZR.Admin.WebApi.Controllers.System { + [Verify] [Route("/monitor/jobLog")] public class TasksLogController : BaseController { @@ -42,7 +43,7 @@ namespace ZR.Admin.WebApi.Controllers.System predicate = predicate.AndIF(queryDto.Status.IfNotEmpty(), m => m.Status == queryDto.Status); predicate = predicate.AndIF(queryDto.JobId.IfNotEmpty(), m => m.JobId == queryDto.JobId); - var response = tasksLogService.GetPages(predicate.ToExpression(), pager, m => m.CreateTime, "Desc"); + var response = tasksLogService.GetPages(predicate.ToExpression(), pager, m => m.CreateTime, OrderByType.Desc); return SUCCESS(response, TIME_FORMAT_FULL); } diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs index 38be60d..84c1513 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs @@ -38,9 +38,8 @@ namespace ZR.Admin.WebApi.Controllers.monitor public IActionResult LoignLogList([FromQuery] SysLogininfor sysLogininfoDto, [FromQuery] PagerInfo pagerInfo) { var list = sysLoginService.GetLoginLog(sysLogininfoDto, pagerInfo); - var vMPage = new VMPageResult(list, pagerInfo); - return ToResponse(ToJson(vMPage.TotalNum, vMPage), TIME_FORMAT_FULL_2); + return ToResponse(ToJson(list.Count, list.ToPage(pagerInfo)), TIME_FORMAT_FULL_2); } /// diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs index 09ecf62..abefe0f 100644 --- a/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs +++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs @@ -41,9 +41,8 @@ namespace ZR.Admin.WebApi.Controllers.monitor PagerInfo pagerInfo = new PagerInfo(sysOperLog.pageNum); var list = sysOperLogService.SelectOperLogList(sysOperLog, pagerInfo); - var vMPage = new VMPageResult(list, pagerInfo); - return ToResponse(ToJson(vMPage.TotalNum, vMPage), TIME_FORMAT_FULL_2); + return ToResponse(ToJson(list.TotalNum, list), TIME_FORMAT_FULL_2); } /// @@ -84,7 +83,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor public IActionResult Export([FromQuery] SysOperLogDto sysOperLog) { var list = sysOperLogService.SelectOperLogList(sysOperLog, new PagerInfo(1, 10000)); - string sFileName = ExportExcel(list, "operlog", "操作日志"); + string sFileName = ExportExcel(list.Result, "operlog", "操作日志"); return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName }); } diff --git a/ZR.Admin.WebApi/Controllers/UploadController.cs b/ZR.Admin.WebApi/Controllers/UploadController.cs deleted file mode 100644 index f1dece4..0000000 --- a/ZR.Admin.WebApi/Controllers/UploadController.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Infrastructure; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Options; -using System; -using System.IO; -using ZR.Admin.WebApi.Filters; -using ZR.Common; - -namespace ZR.Admin.WebApi.Controllers -{ - [Route("[controller]/[action]")] - public class UploadController : BaseController - { - private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger(); - private OptionsSetting OptionsSetting; - private IWebHostEnvironment WebHostEnvironment; - public UploadController(IOptions optionsSetting, IWebHostEnvironment webHostEnvironment) - { - OptionsSetting = optionsSetting.Value; - WebHostEnvironment = webHostEnvironment; - } - /// - /// 存储文件 - /// - /// - /// - [HttpPost] - [Verify] - [ActionPermissionFilter(Permission = "system")] - public IActionResult SaveFile([FromForm(Name = "file")] IFormFile formFile) - { - if (formFile == null) throw new CustomException(ResultCode.PARAM_ERROR, "上传图片不能为空"); - string fileExt = Path.GetExtension(formFile.FileName); - string fileName = FileUtil.HashFileName(Guid.NewGuid().ToString()).ToLower() + fileExt; - string finalFilePath = Path.Combine(WebHostEnvironment.WebRootPath, FileUtil.GetdirPath("uploads"), fileName); - finalFilePath = finalFilePath.Replace("\\", "/").Replace("//", "/"); - - if (!Directory.Exists(Path.GetDirectoryName(finalFilePath))) - { - Directory.CreateDirectory(Path.GetDirectoryName(finalFilePath)); - } - - using (var stream = new FileStream(finalFilePath, FileMode.Create)) - { - formFile.CopyToAsync(stream); - } - - string accessPath = $"{OptionsSetting.Upload.UploadUrl}/{FileUtil.GetdirPath("uploads").Replace("\\", " /")}{fileName}"; - return ToResponse(ResultCode.SUCCESS, new { accessPath, fullPath = finalFilePath }); - } - } -} diff --git a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs deleted file mode 100644 index 0fdfee2..0000000 --- a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs +++ /dev/null @@ -1,154 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using SqlSugar; -using Infrastructure; -using Infrastructure.Attribute; -using Infrastructure.Enums; -using Infrastructure.Model; -using Mapster; -using ZR.Model.Dto; -using ZR.Model.Models; -using ZR.Service.Business; -using ZR.Admin.WebApi.Extensions; -using ZR.Admin.WebApi.Filters; -using ZR.Common; -using Infrastructure.Extensions; - -namespace ZR.Admin.WebApi.Controllers -{ - /// - /// 代码生成演示Controller - /// - /// @author zr - /// @date 2021-11-24 - /// - [Verify] - [Route("business/Gendemo")] - public class GendemoController : BaseController - { - /// - /// 代码生成演示接口 - /// - private readonly IGendemoService _GendemoService; - - public GendemoController(IGendemoService GendemoService) - { - _GendemoService = GendemoService; - } - - /// - /// 查询代码生成演示列表 - /// - /// - [HttpGet("list")] - [ActionPermissionFilter(Permission = "business:gendemo:list")] - public IActionResult QueryGendemo([FromQuery] GendemoQueryDto parm) - { - //开始拼装查询条件 - var predicate = Expressionable.Create(); - - //TODO 自己实现搜索条件查询语法参考Sqlsugar，默认查询所有 - //predicate = predicate.And(m => m.Name.Contains(parm.Name)); - - var response = _GendemoService.GetPages(predicate.ToExpression(), parm); - - return SUCCESS(response); - } - - /// - /// 查询代码生成演示详情 - /// - /// - /// - [HttpGet("{Id}")] - [ActionPermissionFilter(Permission = "business:gendemo:query")] - public IActionResult GetGendemo(int Id) - { - var response = _GendemoService.GetId(Id); - - return SUCCESS(response); - } - - /// - /// 添加代码生成演示 - /// - /// - [HttpPost] - [ActionPermissionFilter(Permission = "business:gendemo:add")] - [Log(Title = "代码生成演示", BusinessType = BusinessType.INSERT)] - public IActionResult AddGendemo([FromBody] GendemoDto parm) - { - if (parm == null) - { - throw new CustomException("请求参数错误"); - } - //从 Dto 映射到 实体 - var model = parm.Adapt().ToCreate(HttpContext); - - return SUCCESS(_GendemoService.Add(model, it => new - { - it.Name, - it.Icon, - it.ShowStatus, - it.AddTime, - it.Sex, - it.Sort, - it.BeginTime, - it.EndTime, - it.Remark, - })); - } - - /// - /// 更新代码生成演示 - /// - /// - [HttpPut] - [ActionPermissionFilter(Permission = "business:gendemo:update")] - [Log(Title = "代码生成演示", BusinessType = BusinessType.UPDATE)] - public IActionResult UpdateGendemo([FromBody] GendemoDto parm) - { - if (parm == null) - { - throw new CustomException("请求实体不能为空"); - } - //从 Dto 映射到 实体 - var model = parm.Adapt().ToUpdate(HttpContext); - - var response = _GendemoService.Update(w => w.Id == model.Id, it => new Gendemo() - { - //Update 字段映射 - Name = model.Name, - Icon = model.Icon, - ShowStatus = model.ShowStatus, - AddTime = model.AddTime, - Sex = model.Sex, - Sort = model.Sort, - BeginTime = model.BeginTime, - EndTime = model.EndTime, - Remark = model.Remark, - }); - - return SUCCESS(response); - } - - /// - /// 删除代码生成演示 - /// - /// - [HttpDelete("{ids}")] - [ActionPermissionFilter(Permission = "business:gendemo:delete")] - [Log(Title = "代码生成演示", BusinessType = BusinessType.DELETE)] - public IActionResult DeleteGendemo(string ids) - { - int[] idsArr = Tools.SpitIntArrary(ids); - if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } - - var response = _GendemoService.Delete(idsArr); - - return SUCCESS(response); - } - } -} \ No newline at end of file diff --git a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs index d2cb61f..8f8faca 100644 --- a/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs +++ b/ZR.Admin.WebApi/Extensions/HttpContextExtension.cs @@ -1,6 +1,7 @@ using Infrastructure; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Http; using Newtonsoft.Json; using System; @@ -67,7 +68,7 @@ namespace ZR.Admin.WebApi.Extensions { var uid = context.User.FindFirstValue(ClaimTypes.PrimarySid); - return !string.IsNullOrEmpty(uid) ? long.Parse(uid) : 0 ; + return !string.IsNullOrEmpty(uid) ? long.Parse(uid) : 0; } public static string GetName(this HttpContext context) { @@ -75,6 +76,16 @@ namespace ZR.Admin.WebApi.Extensions return uid; } + + /// + /// ClaimsIdentity + /// + /// + /// + public static IEnumerable GetClaims(this HttpContext context) + { + return context.User?.Identities; + } //public static int GetRole(this HttpContext context) //{ // var roleid = context.User.FindFirstValue(ClaimTypes.Role) ?? "0"; @@ -84,9 +95,7 @@ namespace ZR.Admin.WebApi.Extensions public static string GetUserAgent(this HttpContext context) { - var str = context.Request.Headers["User-Agent"]; - - return str; + return context.Request.Headers["User-Agent"]; } /// @@ -96,9 +105,7 @@ namespace ZR.Admin.WebApi.Extensions /// public static string GetToken(this HttpContext context) { - var str = context.Request.Headers["Token"]; - - return str; + return context.Request.Headers["Authorization"]; } public static ClientInfo GetClientInfo(this HttpContext context) @@ -116,12 +123,12 @@ namespace ZR.Admin.WebApi.Extensions } /// - /// 登录cookie写入 + ///组装Claims /// /// /// /// - public static List WriteCookies(this HttpContext context, LoginUser user) + public static List AddClaims(this HttpContext context, LoginUser user) { //1、创建Cookie保存用户信息，使用claim var claims = new List() @@ -138,13 +145,21 @@ namespace ZR.Admin.WebApi.Extensions { claims.Add(new Claim("perm", string.Join(",", user.Permissions))); } + + //写入Cookie + //WhiteCookie(context, claims); + return claims; + } + + private static void WhiteCookie(HttpContext context, List claims) + { //2.创建声明主题 指定认证方式 这里使用cookie var claimsIdentity = new ClaimsIdentity(claims, "Login"); Task.Run(async () => { await context.SignInAsync( - CookieAuthenticationDefaults.AuthenticationScheme,//这里要注意的是HttpContext.SignInAsync(AuthenticationType,…) 所设置的Scheme一定要与前面的配置一样，这样对应的登录授权才会生效。 + JwtBearerDefaults.AuthenticationScheme,//这里要注意的是HttpContext.SignInAsync(AuthenticationType,…) 所设置的Scheme一定要与前面的配置一样，这样对应的登录授权才会生效。 new ClaimsPrincipal(claimsIdentity), new AuthenticationProperties() { @@ -153,7 +168,6 @@ namespace ZR.Admin.WebApi.Extensions ExpiresUtc = DateTimeOffset.Now.AddDays(1),//有效时间 }); }).Wait(); - return claims; } } diff --git a/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs b/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs new file mode 100644 index 0000000..40f9d49 --- /dev/null +++ b/ZR.Admin.WebApi/Extensions/SwaggerExtension.cs @@ -0,0 +1,57 @@ +using Infrastructure; +using Microsoft.AspNetCore.Authentication.JwtBearer; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; +using Swashbuckle.AspNetCore.Filters; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; + +namespace ZR.Admin.WebApi.Extensions +{ + public static class SwaggerExtension + { + public static void AddSwaggerConfig(this IServiceCollection services) + { + if (services == null) throw new ArgumentNullException(nameof(services)); + IWebHostEnvironment hostEnvironment = App.GetRequiredService(); + + services.AddSwaggerGen(c => + { + c.SwaggerDoc("v1", new OpenApiInfo + { + Title = "ZrAdmin.NET Api - .NET5", + Version = "v1", + Description = "", + }); + //if (CurrentEnvironment.IsDevelopment()) + //{ + //添加文档注释 + c.IncludeXmlComments(Path.Combine(hostEnvironment.ContentRootPath, "ZRAdmin.xml"), true); + //} + //参考文章：http://www.zyiz.net/tech/detail-134965.html + //需要安装包Swashbuckle.AspNetCore.Filters + // 开启权限小锁 需要在对应的Action上添加[Authorize]才能看到 + c.OperationFilter(); + c.OperationFilter(); + + //在header 中添加token，传递到后台 + c.OperationFilter(); + + c.AddSecurityDefinition(JwtBearerDefaults.AuthenticationScheme, + new OpenApiSecurityScheme + { + In = ParameterLocation.Header, + Description = "请输入Login接口返回的Token，前置Bearer。示例：Bearer {Token}", + Name = "Authorization",//jwt默认的参数名称, + Type = SecuritySchemeType.ApiKey, //指定ApiKey + BearerFormat = "JWT",//标识承载令牌的格式 该信息主要是出于文档目的 + Scheme = JwtBearerDefaults.AuthenticationScheme//授权中要使用的HTTP授权方案的名称 + }); + }); + } + } +} diff --git a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs index cbfaff1..2b4db73 100644 --- a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs +++ b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs @@ -10,6 +10,7 @@ using NLog; using System; using System.Linq; using ZR.Admin.WebApi.Extensions; +using ZR.Admin.WebApi.Framework; using ZR.Model.System; namespace ZR.Admin.WebApi.Filters @@ -44,12 +45,10 @@ namespace ZR.Admin.WebApi.Filters string ip = HttpContextExtension.GetClientUserIp(context.HttpContext); string url = context.HttpContext.Request.Path; var isAuthed = context.HttpContext.User.Identity.IsAuthenticated; - // 检查登陆 - 在SignIn中判断用户合法性，将登陆信息保存在Cookie中，在SignOut中移除登陆信息 var userName = context.HttpContext.User.Identity.Name; //使用jwt token校验2020-11-21 - //string token = context.HttpContext.Request.Headers["Token"]; - LoginUser info = Framework.JwtUtil.GetLoginUser(context.HttpContext); + LoginUser info = JwtUtil.GetLoginUser(context.HttpContext); if (info != null && info.UserId > 0) { @@ -58,7 +57,7 @@ namespace ZR.Admin.WebApi.Filters else { string msg = $"请求访问:{url}授权认证失败，无法访问系统资源"; - logger.Info(msg); + logger.Info($"用户{userName}{msg}"); context.Result = new JsonResult(new ApiResult((int)ResultCode.DENY, msg)); } diff --git a/ZR.Admin.WebApi/Framework/JwtUtil.cs b/ZR.Admin.WebApi/Framework/JwtUtil.cs index 1f7f073..75f237a 100644 --- a/ZR.Admin.WebApi/Framework/JwtUtil.cs +++ b/ZR.Admin.WebApi/Framework/JwtUtil.cs @@ -18,8 +18,6 @@ namespace ZR.Admin.WebApi.Framework /// public class JwtUtil { - public static readonly string KEY = "asdfghjklzxcvbnm"; - /// /// 获取用户身份信息 /// @@ -28,6 +26,7 @@ namespace ZR.Admin.WebApi.Framework public static LoginUser GetLoginUser(HttpContext httpContext) { string token = HttpContextExtension.GetToken(httpContext); + if (!string.IsNullOrEmpty(token)) { return ValidateJwtToken(ParseToken(token)); @@ -42,21 +41,52 @@ namespace ZR.Admin.WebApi.Framework /// public static string GenerateJwtToken(List claims) { + JwtSettings jwtSettings = new(); + ConfigUtils.Instance.Bind("JwtSettings", jwtSettings); + var tokenHandler = new JwtSecurityTokenHandler(); - var key = Encoding.ASCII.GetBytes(KEY); - var expires = ConfigUtils.Instance.GetAppConfig("sysConfig:tokenExpire", 10); + var key = Encoding.ASCII.GetBytes(jwtSettings.SecretKey); + claims.Add(new Claim("Audience", jwtSettings.Audience)); + claims.Add(new Claim("Issuer", jwtSettings.Issuer)); + var tokenDescriptor = new SecurityTokenDescriptor { Subject = new ClaimsIdentity(claims), - //Issuer = "", - //Audience = "", - Expires = DateTime.Now.AddMinutes(expires), + Issuer = jwtSettings.Issuer, + Audience = jwtSettings.Audience, + IssuedAt = DateTime.Now,//token生成时间 + Expires = DateTime.Now.AddMinutes(jwtSettings.Expire), + TokenType = "Bearer", + //对称秘钥，签名证书 SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature) }; var token = tokenHandler.CreateToken(tokenDescriptor); return tokenHandler.WriteToken(token); } + /// + /// 验证Token + /// + /// + public static TokenValidationParameters ValidParameters() + { + JwtSettings jwtSettings = new(); + ConfigUtils.Instance.Bind("JwtSettings", jwtSettings); + var key = Encoding.ASCII.GetBytes(jwtSettings.SecretKey); + + var tokenDescriptor = new TokenValidationParameters + { + ValidateIssuerSigningKey = true, + ValidateIssuer = true, + ValidateAudience = true, + ValidIssuer = jwtSettings.Issuer, + ValidAudience = jwtSettings.Audience, + IssuerSigningKey = new SymmetricSecurityKey(key), + ValidateLifetime = true,//是否验证Token有效期，使用当前时间与Token的Claims中的NotBefore和Expires对比 + RequireExpirationTime = true,//过期时间 + }; + return tokenDescriptor; + } /// /// 从令牌中获取数据声明 /// @@ -65,21 +95,13 @@ namespace ZR.Admin.WebApi.Framework public static IEnumerable ParseToken(string token) { var tokenHandler = new JwtSecurityTokenHandler(); - var key = Encoding.ASCII.GetBytes(KEY); + var validateParameter = ValidParameters(); + token = token.Replace("Bearer ", ""); try { - tokenHandler.ValidateToken(token, new TokenValidationParameters - { - ValidateIssuerSigningKey = true, - IssuerSigningKey = new SymmetricSecurityKey(key), - ValidateIssuer = false, - ValidateAudience = false, - // set clockskew to zero so tokens expire exactly at token expiration time (instead of 5 minutes later) - ClockSkew = TimeSpan.Zero - }, out SecurityToken validatedToken); + tokenHandler.ValidateToken(token, validateParameter, out SecurityToken validatedToken); - //{{"alg":"HS256","typ":"JWT"}.{"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/sid":"2","unique_name":"ry","nameid":"2","given_name":"若依","nbf":1606654010,"exp":1606740410,"iat":1606654010}} - var jwtToken = (JwtSecurityToken)validatedToken; + var jwtToken = tokenHandler.ReadJwtToken(token); return jwtToken.Claims; } catch (Exception ex) diff --git a/ZR.Admin.WebApi/Properties/launchSettings.json b/ZR.Admin.WebApi/Properties/launchSettings.json index d3473a5..8fd0a5e 100644 --- a/ZR.Admin.WebApi/Properties/launchSettings.json +++ b/ZR.Admin.WebApi/Properties/launchSettings.json @@ -2,11 +2,11 @@ "profiles": { "ZRAdmin": { "commandName": "Project", - "launchBrowser": true, + "launchBrowser": false, "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "" + "ASPNETCORE_ENVIRONMENT": "Production" }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "applicationUrl": "http://localhost:8888" } } } \ No newline at end of file diff --git a/ZR.Admin.WebApi/Startup.cs b/ZR.Admin.WebApi/Startup.cs index aa0e1ce..7e334ba 100644 --- a/ZR.Admin.WebApi/Startup.cs +++ b/ZR.Admin.WebApi/Startup.cs @@ -2,6 +2,7 @@ using Hei.Captcha; using Infrastructure; using Infrastructure.Extensions; using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Hosting; @@ -12,6 +13,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.OpenApi.Models; using SqlSugar.IOC; +using Swashbuckle.AspNetCore.Filters; using System; using System.Collections.Generic; using System.IO; @@ -42,7 +44,7 @@ namespace ZR.Admin.WebApi { c.AddPolicy("Policy", policy => { - policy.WithOrigins(corsUrls.Split(',', System.StringSplitOptions.RemoveEmptyEntries)) + policy.WithOrigins(corsUrls.Split(',', StringSplitOptions.RemoveEmptyEntries)) .AllowAnyHeader()//ͷ .AllowCredentials()//cookie .AllowAnyMethod();//ⷽ @@ -55,35 +57,37 @@ namespace ZR.Admin.WebApi services.AddSession(); services.AddHttpContextAccessor(); - //Cookie ֤ - services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(); //Model services.Configure(Configuration); + services.Configure(Configuration); + var jwtSettings = new JwtSettings(); + Configuration.Bind("JwtSettings", jwtSettings); - InjectRepositories(services); + //Cookie ֤ + services.AddAuthentication(options => + { + options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; + options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; + }).AddCookie() + .AddJwtBearer(o => + { + o.TokenValidationParameters = JwtUtil.ValidParameters(); + }); + + InjectServices(services); services.AddMvc(options => { options.Filters.Add(typeof(GlobalActionMonitor));//ȫע쳣 }) - .AddMvcLocalization() - .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix) .AddJsonOptions(options => { options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeConverter()); options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeNullConverter()); }); - services.AddSwaggerGen(c => - { - c.SwaggerDoc("v1", new OpenApiInfo { Title = "ZrAdmin", Version = "v1" }); - if (CurrentEnvironment.IsDevelopment()) - { - //ĵע - c.IncludeXmlComments("ZRAdmin.xml", true); - } - }); + services.AddSwaggerConfig(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -111,7 +115,9 @@ namespace ZR.Admin.WebApi //app.UseAuthenticationAuthenticationммݵǰHttpеCookieϢHttpContext.Userԣõ //ֻapp.UseAuthentication֮עмܹHttpContext.Userжȡֵ //ҲΪʲôǿapp.UseAuthenticationһҪapp.UseMvcǰ棬ΪֻASP.NET CoreMVCмвܶȡHttpContext.Userֵ + //1.ȿ֤ app.UseAuthentication(); + //2.ٿȨ app.UseAuthorization(); app.UseSession(); app.UseResponseCaching(); @@ -133,7 +139,7 @@ namespace ZR.Admin.WebApi /// עServices /// /// - private void InjectRepositories(IServiceCollection services) + private void InjectServices(IServiceCollection services) { services.AddAppService(); @@ -148,12 +154,12 @@ namespace ZR.Admin.WebApi SugarIocServices.AddSqlSugar(new List() { new IocConfig() { - ConfigId = "0", //ݿ + ConfigId = "0", ConnectionString = connStr, DbType = (IocDbType)dbType, IsAutoCloseConnection = true//Զͷ }, new IocConfig() { - ConfigId = "1", // ⻧õ + ConfigId = "1", ConnectionString = connStrBus, DbType = (IocDbType)dbType_bus, IsAutoCloseConnection = true//Զͷ @@ -161,14 +167,13 @@ namespace ZR.Admin.WebApi }); //ʽ ӡSQL - DbScoped.SugarScope.GetConnection(0).Aop.OnLogExecuting = (sql, pars) => + DbScoped.SugarScope.GetConnection("0").Aop.OnLogExecuting = (sql, pars) => { - Console.BackgroundColor = ConsoleColor.Yellow; Console.WriteLine("SQL䡿" + sql.ToLower() + "\r\n" + DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value))); }; //ӡ־ - DbScoped.SugarScope.GetConnection(0).Aop.OnError = (e) => + DbScoped.SugarScope.GetConnection("0").Aop.OnError = (e) => { Console.WriteLine($"[ִSql]{e.Message}SQL={e.Sql}"); Console.WriteLine(); @@ -177,7 +182,6 @@ namespace ZR.Admin.WebApi //ʽ ӡSQL DbScoped.SugarScope.GetConnection(1).Aop.OnLogExecuting = (sql, pars) => { - Console.BackgroundColor = ConsoleColor.Yellow; Console.WriteLine("SQLBus" + sql.ToLower() + "\r\n" + DbScoped.SugarScope.Utilities.SerializeObject(pars.ToDictionary(it => it.ParameterName, it => it.Value))); }; diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj index a5b7c72..07c5a31 100644 --- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj +++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj @@ -15,27 +15,27 @@ - - + - - - - - - - - - - + + + + + + + + + + + @@ -60,49 +60,14 @@ Always - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - + - - - - - - Always - - - Always - + diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index 8b29429..b8dcce0 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -15,26 +15,34 @@ "urls": "http://localhost:8888", //Ŀurl "sysConfig": { "DBCommandTimeout": 10, - "tokenExpire": 1440, //Jwt tokenʱʱ䣨֣ "cors": "http://localhost:8887" //ַ"," }, + "JwtSettings": { + "Issuer": "https://localhost:8888", + "Audience": "https://localhost:8888", + "SecretKey": "Hello-key-ZRADMIN.NET-20210101", + "Expire": 5 + }, "DemoMode": false, //Ƿʾģʽ "DbKey": "", //ݿkey "Upload": { "UploadDirectory": "/", "UploadUrl": "http://localhost:8888" }, - "QIQIU_OSS": { + //ƴ洢 + "ALIYUN_OSS": { "REGIONID": "cn-hangzhou", "KEY": "XX", - "SECRET": "XX" + "SECRET": "XX", + "bucketName": "bucketName", + "domainUrl": "http://xxx.xxx.com" //Դ }, "gen": { - "conn": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;user=zr;pwd=abc;database={database};Trusted_Connection=SSPI", + "conn": "server=LAPTOP-STKF2M8H\\SQLEXPRESS;user=zr;pwd=abc;database=ZrAdmin;Trusted_Connection=SSPI", "dbType": 1, //MySql = 0, SqlServer = 1 "autoPre": true, //Զȥǰ׺ "author": "zr", - "tablePrefix": "live_,sys_" //"ǰ׺ǰ׺öŷָ", + "tablePrefix": "sys_" //"ǰ׺ǰ׺öŷָ", }, //Ϣ "MailOptions": { diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt deleted file mode 100644 index 27824d5..0000000 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt +++ /dev/null @@ -1,138 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using SqlSugar; -using Infrastructure; -using Infrastructure.Attribute; -using Infrastructure.Enums; -using Infrastructure.Model; -using Mapster; -using {ModelsNamespace}.Dto; -using {ModelsNamespace}.Models; -using {ServicesNamespace}.Business; -using {ApiControllerNamespace}.Extensions; -using {ApiControllerNamespace}.Filters; -using ZR.Common; -using Infrastructure.Extensions; - -namespace {ApiControllerNamespace}.Controllers -{ - /// - /// {FunctionName}Controller - /// - /// @author {Author} - /// @date {DateTime} - /// - [Verify] - [Route("{ModuleName}/{ModelName}")] - public class {ModelName}Controller: BaseController - { - /// - /// {FunctionName}接口 - /// - private readonly I{ModelName}Service _{ModelName}Service; - - public {ModelName}Controller(I{ModelName}Service {ModelName}Service) - { - _{ModelName}Service = {ModelName}Service; - } - - /// - /// 查询{FunctionName}列表 - /// - /// - [HttpGet("list")] - [ActionPermissionFilter(Permission = "{Permission}:list")] - public IActionResult Query{ModelName}([FromQuery] {ModelName}QueryDto parm) - { - //开始拼装查询条件 - var predicate = Expressionable.Create<{ModelName}>(); - - //TODO 自己实现搜索条件查询语法参考Sqlsugar，默认查询所有 - //predicate = predicate.And(m => m.Name.Contains(parm.Name)); - - var response = _{ModelName}Service.GetPages(predicate.ToExpression(), parm); - - return SUCCESS(response); - } - - /// - /// 查询{FunctionName}详情 - /// - /// - /// - [HttpGet("{{PrimaryKey}}")] - [ActionPermissionFilter(Permission = "{Permission}:query")] - public IActionResult Get{ModelName}({PKCsharpType} {PrimaryKey}) - { - var response = _{ModelName}Service.GetId({PrimaryKey}); - - return SUCCESS(response); - } - - /// - /// 添加{FunctionName} - /// - /// - [HttpPost] - [ActionPermissionFilter(Permission = "{Permission}:add")] - [Log(Title = "{FunctionName}", BusinessType = BusinessType.INSERT)] - public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm) - { - if (parm == null) - { - throw new CustomException("请求参数错误"); - } - //从 Dto 映射到 实体 - var model = parm.Adapt<{ModelName}>().ToCreate(HttpContext); - - return SUCCESS(_{ModelName}Service.Add(model, it => new - { -{InsertColumn} - })); - } - - /// - /// 更新{FunctionName} - /// - /// - [HttpPut] - [ActionPermissionFilter(Permission = "{Permission}:update")] - [Log(Title = "{FunctionName}", BusinessType = BusinessType.UPDATE)] - public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm) - { - if (parm == null) - { - throw new CustomException("请求实体不能为空"); - } - //从 Dto 映射到 实体 - var model = parm.Adapt<{ModelName}>().ToUpdate(HttpContext); - - var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}() - { - //Update 字段映射 -{UpdateColumn} - }); - - return SUCCESS(response); - } - - /// - /// 删除{FunctionName} - /// - /// - [HttpDelete("{ids}")] - [ActionPermissionFilter(Permission = "{Permission}:delete")] - [Log(Title = "{FunctionName}", BusinessType = BusinessType.DELETE)] - public IActionResult Delete{ModelName}(string ids) - { - int[] idsArr = Tools.SpitIntArrary(ids); - if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } - - var response = _{ModelName}Service.Delete(idsArr); - - return SUCCESS(response); - } - } -} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/IServiceTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/IServiceTemplate.txt deleted file mode 100644 index b64fd98..0000000 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/IServiceTemplate.txt +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using {ModelsNamespace}.Models; - -namespace {IServicsNamespace}.Business -{ - /// - /// {FunctionName}service接口 - /// - /// @author {Author} - /// @date {DateTime} - /// - public interface I{ModelTypeName}Service: IBaseService<{ModelTypeName}> - { - } -} diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/InputDtoTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/InputDtoTemplate.txt deleted file mode 100644 index ded802d..0000000 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/InputDtoTemplate.txt +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using {ModelsNamespace}.Dto; -using {ModelsNamespace}.Models; - -namespace {DtosNamespace}.Dto -{ - /// - /// {FunctionName}输入对象模型 - /// - public class {ModelTypeName}Dto - { -{PropertyName} - } - - /// - /// {FunctionName}查询对象模型 - /// - public class {ModelTypeName}QueryDto: PagerInfo - { -{QueryProperty} - public DateTime? BeginTime { get; set; } - public DateTime? EndTime { get; set; } - } -} diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ModelTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ModelTemplate.txt deleted file mode 100644 index 66bbcce..0000000 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ModelTemplate.txt +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace {ModelsNamespace}.Models -{ - /// - /// {FunctionName}，数据实体对象 - /// - /// @author {Author} - /// @date {DateTime} - /// - [SqlSugar.SugarTable("{TableName}")] - public class {ModelTypeName} - { -{PropertyName} - } -} diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt index aeb9db2..dd44cd0 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt @@ -1,23 +1,25 @@ -- 菜单 -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time, remark) -VALUES ('{FunctionName}', 0, 1, '{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '{Permission}:list', 'icon1', sysdate(), '{FunctionName}菜单'); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time, remark) +VALUES ('${genTable.functionName}', ${parentId}, 1, '${genTable.ModuleName}/${replaceDto.ModelTypeName}', '${genTable.ModuleName}/${genTable.BusinessName}/index', 0, 0, 'C', '0', '0', '${replaceDto.PermissionPrefix}:list', 'icon1', '', sysdate(), '${genTable.functionName}菜单'); -- 按钮父菜单id SELECT @menuId := LAST_INSERT_ID(); -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:query', '', '', sysdate(), '', NULL, ''); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) +VALUES ('查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:query', '', sysdate()); -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}新增', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:add', '', '', sysdate(), '', NULL, NULL); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) +VALUES ('新增', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:add', '', sysdate()); -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}删除', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:delete', '', '', sysdate(), '', NULL, NULL); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) +VALUES ('删除', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:delete', '', sysdate()); -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', sysdate(), '', NULL, NULL); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) +VALUES ('修改', @menuId, 4, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:update', '', sysdate()); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time) +VALUES ('导出', @menuId, 5, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:export', '', sysdate()); SELECT * FROM sys_menu WHERE parentId = @menuId; SELECT * FROM sys_menu WHERE menuId = @menuId; \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/RepositoryTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/RepositoryTemplate.txt deleted file mode 100644 index a073a0c..0000000 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/RepositoryTemplate.txt +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using Infrastructure.Attribute; -using {RepositoriesNamespace}.System; -using {ModelsNamespace}.Models; - -namespace {RepositoriesNamespace} -{ - /// - /// {FunctionName}仓储接口的实现 - /// - /// @author {Author} - /// @date {DateTime} - /// - [AppService(ServiceLifetime = LifeTime.Transient)] - public class {ModelTypeName}Repository : BaseRepository<{ModelTypeName}> - { - #region 业务逻辑代码 - #endregion - } -} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ServiceTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ServiceTemplate.txt deleted file mode 100644 index fe7121a..0000000 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ServiceTemplate.txt +++ /dev/null @@ -1,27 +0,0 @@ -using Infrastructure; -using Infrastructure.Attribute; -using {ModelsNamespace}.Models; -using {IRepositoriesNamespace}; - -namespace {ServicesNamespace}.Business -{ - /// - /// {FunctionName}Service业务层处理 - /// - /// @author {Author} - /// @date {DateTime} - /// - [AppService(ServiceType = typeof(I{ModelTypeName}Service), ServiceLifetime = LifeTime.Transient)] - public class {ModelTypeName}Service: BaseService<{ModelTypeName}>, I{ModelTypeName}Service - { - private readonly {ModelTypeName}Repository _{ModelTypeName}repository; - public {ModelTypeName}Service({ModelTypeName}Repository repository) - { - _{ModelTypeName}repository = repository; - } - - #region 业务逻辑代码 - - #endregion - } -} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt index 6f5e049..df62b1c 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt @@ -1,22 +1,25 @@ --- {FunctionName}菜单 +-- ${genTable.functionName}菜单 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_time, remark) -VALUES ('{FunctionName}', {ParentId}, 1, '{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '{Permission}:list', 'icon1', GETDATE(), '{FunctionName}'); +VALUES ('${genTable.functionName}', ${parentId}, 1, '${genTable.ModuleName}/${genTable.BusinessName}', '${genTable.ModuleName}/${genTable.BusinessName}', 0, 0, 'C', '0', '0', '${replaceDto.PermissionPrefix}:list', 'icon1', GETDATE(), '${genTable.functionName}'); -- 按钮父菜单id declare @menuId int = @@identity -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:query', '', '', GETDATE(), '', NULL, ''); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) +VALUES ('查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:query', '', '', GETDATE()); -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}新增', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:add', '', '', GETDATE(), '', NULL, NULL); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) +VALUES ('新增', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:add', '', '', GETDATE()); -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}删除', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:delete', '', '', GETDATE(), '', NULL, NULL); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) +VALUES ('删除', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:delete', '', '', GETDATE()); -INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{FunctionName}修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', GETDATE(), '', NULL, NULL); +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) +VALUES ('修改', @menuId, 4, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:update', '', '', GETDATE()); -SELECT * FROM sys_menu WHERE parentId = {ParentId}; +INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time) +VALUES ('导出', @menuId, 5, '#', NULL, 0, 0, 'F', '0', '0', '${replaceDto.PermissionPrefix}:export', '', '', GETDATE()); + +SELECT * FROM sys_menu WHERE parentId = @menuId; SELECT * FROM sys_menu WHERE menuId = @menuId; \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt new file mode 100644 index 0000000..8d53e48 --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -0,0 +1,184 @@ +using Microsoft.AspNetCore.Mvc; +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using SqlSugar; +using Infrastructure; +using Infrastructure.Attribute; +using Infrastructure.Enums; +using Infrastructure.Model; +using Mapster; +using ${options.ModelsNamespace}.Dto; +using ${options.ModelsNamespace}.Models; +using ${options.ServicesNamespace}.Business; +using ${options.ApiControllerNamespace}.Extensions; +using ${options.ApiControllerNamespace}.Filters; +using ZR.Common; +using Infrastructure.Extensions; +using System.Linq; + +namespace ${options.ApiControllerNamespace}.Controllers +{ + /// + /// ${genTable.functionName}Controller + /// + /// @author ${replaceDto.Author} + /// @date ${replaceDto.AddTime} + /// + [Verify] + [Route("${genTable.ModuleName}/${replaceDto.ModelTypeName}")] + public class ${replaceDto.ModelTypeName}Controller : BaseController + { + /// + /// ${genTable.FunctionName}接口 + /// + private readonly I${replaceDto.ModelTypeName}Service _${replaceDto.ModelTypeName}Service; + + public ${replaceDto.ModelTypeName}Controller(I${replaceDto.ModelTypeName}Service ${replaceDto.ModelTypeName}Service) + { + _${replaceDto.ModelTypeName}Service = ${replaceDto.ModelTypeName}Service; + } + + /// + /// 查询${genTable.FunctionName}列表 + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:list")] + public IActionResult Query${replaceDto.ModelTypeName}([FromQuery] ${replaceDto.ModelTypeName}QueryDto parm) + { + //开始拼装查询条件 + var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>(); + + //搜索条件查询语法参考Sqlsugar +${QueryCondition} +$if(genTable.SortField != "") + var response = _${replaceDto.ModelTypeName}Service.GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}"); +$else + var response = _${replaceDto.ModelTypeName}Service.GetPages(predicate.ToExpression(), parm); +$end + return SUCCESS(response); + } + + /// + /// 查询${genTable.FunctionName}详情 + /// + /// + /// + [HttpGet("{${replaceDto.PKName}}")] + [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:query")] + public IActionResult Get${replaceDto.ModelTypeName}(${replaceDto.PKType} ${replaceDto.PKName}) + { + var response = _${replaceDto.ModelTypeName}Service.GetFirst(x => x.${replaceDto.PKName} == ${replaceDto.PKName}); + + return SUCCESS(response); + } + + /// + /// 添加${genTable.FunctionName} + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:add")] + [Log(Title = "${genTable.FunctionName}", BusinessType = BusinessType.INSERT)] + public IActionResult Add${replaceDto.ModelTypeName}([FromBody] ${replaceDto.ModelTypeName}Dto parm) + { + if (parm == null) + { + throw new CustomException("请求参数错误"); + } + //从 Dto 映射到 实体 + var model = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); + + return SUCCESS(_${replaceDto.ModelTypeName}Service.Insert(model, it => new + { +$foreach(item in genTable.Columns) +$if((item.IsInsert)) + it.$item.CsharpField, +$end +${end} + })); + } + + /// + /// 更新${genTable.FunctionName} + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")] + [Log(Title = "${genTable.FunctionName}", BusinessType = BusinessType.UPDATE)] + public IActionResult Update${replaceDto.ModelTypeName}([FromBody] ${replaceDto.ModelTypeName}Dto parm) + { + if (parm == null) + { + throw new CustomException("请求实体不能为空"); + } + //从 Dto 映射到 实体 + var model = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext); + + var response = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == model.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}() + { + //Update 字段映射 +$foreach(item in genTable.Columns) +$if((item.IsEdit)) + $item.CsharpField = model.$item.CsharpField, +$end +${end} + }); + + return SUCCESS(response); + } + + /// + /// 删除${genTable.FunctionName} + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:delete")] + [Log(Title = "${genTable.FunctionName}", BusinessType = BusinessType.DELETE)] + public IActionResult Delete${replaceDto.ModelTypeName}(string ids) + { + int[] idsArr = Tools.SpitIntArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + + var response = _${replaceDto.ModelTypeName}Service.Delete(idsArr); + + return SUCCESS(response); + } + + /// + /// ${genTable.FunctionName}导出 + /// + /// + [Log(BusinessType = BusinessType.EXPORT, IsSaveResponseData = false, Title = "${genTable.FunctionName}")] + [HttpGet("export")] + [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:export")] + public IActionResult Export() + { + var list = _${replaceDto.ModelTypeName}Service.GetAll(); + + string sFileName = ExportExcel(list, "${replaceDto.ModelTypeName}", "${genTable.FunctionName}"); + return SUCCESS(new { path = "/export/" + sFileName, fileName = sFileName }); + } + +$if(genTable.SortField != "") + /// + /// 保存排序 + /// + /// + /// + /// + [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")] + [HttpGet("ChangeSort")] + [Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)] + public IActionResult ChangeSort(int id = 0, int orderNum = 0) + { + if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } + + bool result = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == id, it => new ${replaceDto.ModelTypeName}() { ${genTable.SortField} = orderNum });; + + return SUCCESS(result); + } +$end + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt new file mode 100644 index 0000000..52b05d7 --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using ${options.ModelsNamespace}.Dto; +using ${options.ModelsNamespace}.Models; + +namespace ${options.DtosNamespace}.Dto +{ + /// + /// ${genTable.FunctionName}输入对象 + /// + public class ${replaceDto.ModelTypeName}Dto + { +$foreach(item in genTable.Columns) +$if((item.IsInsert || item.IsEdit || item.IsPk || item.IsIncrement)) + public $item.CsharpType$item.RequiredStr $item.CsharpField { get; set; } +$end +${end} + } + + /// + /// ${genTable.FunctionName}查询对象 + /// + public class ${replaceDto.ModelTypeName}QueryDto : PagerInfo + { +$foreach(item in genTable.Columns) +$if(item.IsQuery) + public $item.CsharpType $item.CsharpField { get; set; } +$end +${end} + + public DateTime? BeginTime { get; set; } + public DateTime? EndTime { get; set; } + } +} diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt new file mode 100644 index 0000000..c06303e --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplIService.txt @@ -0,0 +1,15 @@ +using System; +using ${options.ModelsNamespace}.Models; + +namespace ${options.IServicsNamespace}.Business +{ + /// + /// ${genTable.FunctionName}service接口 + /// + /// @author ${replaceDto.Author} + /// @date ${replaceDto.AddTime} + /// + public interface I${replaceDto.ModelTypeName}Service: IBaseService<${replaceDto.ModelTypeName}> + { + } +} diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt new file mode 100644 index 0000000..a6e326d --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using SqlSugar; + +namespace ${options.ModelsNamespace}.Models +{ + /// + /// ${genTable.FunctionName}，数据实体对象 + /// + /// @author ${replaceDto.Author} + /// @date ${replaceDto.AddTime} + /// + [SugarTable("${genTable.TableName}")] + public class ${replaceDto.ModelTypeName} + { +$foreach(item in genTable.Columns) + /// + /// 描述 : ${item.ColumnComment} + /// 空值 :$if(item.IsRequired == "True") false $else true $end + /// +$if(item.IsPk || item.IsIncrement) + [SqlSugar.SugarColumn(IsPrimaryKey = ${item.IsPk.ToString().ToLower()}, IsIdentity = ${item.IsIncrement.ToString().ToLower()})] +$end + public $item.CsharpType$item.RequiredStr $item.CsharpField { get; set; } +${end} + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplRepository.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplRepository.txt new file mode 100644 index 0000000..cd43d77 --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplRepository.txt @@ -0,0 +1,20 @@ +using System; +using Infrastructure.Attribute; +using ${options.RepositoriesNamespace}.System; +using ${options.ModelsNamespace}.Models; + +namespace ${options.RepositoriesNamespace} +{ + /// + /// ${genTable.FunctionName}仓储 + /// + /// @author ${replaceDto.Author} + /// @date ${replaceDto.AddTime} + /// + [AppService(ServiceLifetime = LifeTime.Transient)] + public class ${replaceDto.ModelTypeName}Repository : BaseRepository<${replaceDto.ModelTypeName}> + { + #region 业务逻辑代码 + #endregion + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt new file mode 100644 index 0000000..0b32e69 --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt @@ -0,0 +1,27 @@ +using Infrastructure; +using Infrastructure.Attribute; +using ${options.ModelsNamespace}.Models; +using ${options.IRepositoriesNamespace}; + +namespace ${options.ServicesNamespace}.Business +{ + /// + /// ${genTable.FunctionName}Service业务层处理 + /// + /// @author ${replaceDto.Author} + /// @date ${replaceDto.AddTime} + /// + [AppService(ServiceType = typeof(I${replaceDto.ModelTypeName}Service), ServiceLifetime = LifeTime.Transient)] + public class ${replaceDto.ModelTypeName}Service : BaseService<${replaceDto.ModelTypeName}>, I${replaceDto.ModelTypeName}Service + { + private readonly ${replaceDto.ModelTypeName}Repository _${replaceDto.ModelTypeName}repository; + public ${replaceDto.ModelTypeName}Service(${replaceDto.ModelTypeName}Repository repository) : base(repository) + { + _${replaceDto.ModelTypeName}repository = repository; + } + + #region 业务逻辑代码 + + #endregion + } +} \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt new file mode 100644 index 0000000..32197e9 --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -0,0 +1,276 @@ + + + diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt new file mode 100644 index 0000000..c70b678 --- /dev/null +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt @@ -0,0 +1,79 @@ +import request from '@/utils/request' + +/** +* ${genTable.functionName}分页查询 +* @param {查询条件} data +*/ +export function list${genTable.BusinessName}(query) { + return request({ + url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/list', + method: 'get', + params: query, + }) +} + +/** +* 新增${genTable.functionName} +* @param data +*/ +export function add${genTable.BusinessName}(data) { + return request({ + url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}', + method: 'post', + data: data, + }) +} + +/** +* 修改${genTable.functionName} +* @param data +*/ +export function update${genTable.BusinessName}(data) { + return request({ + url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}', + method: 'PUT', + data: data, + }) +} + +/** +* 获取${genTable.functionName}详情 +* @param {Id} +*/ +export function get${genTable.BusinessName}(id) { + return request({ + url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/' + id, + method: 'get' + }) +} + +/** +* 删除${genTable.functionName} +* @param {主键} pid +*/ +export function del${genTable.BusinessName}(pid) { + return request({ + url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/' + pid, + method: 'delete' + }) +} +// 导出${genTable.functionName} +export function export${replaceDto.ModelTypeName}(query) { + return request({ + url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/export', + method: 'get', + params: query + }) +} + +$if(genTable.SortField != "") +//排序 +export function changeSort(data) { + return request({ + url: '${genTable.ModuleName}/${replaceDto.ModelTypeName}/ChangeSort', + method: 'get', + params: data + }) +} + +$end \ No newline at end of file diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt deleted file mode 100644 index 29b3edd..0000000 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt +++ /dev/null @@ -1,59 +0,0 @@ -import request from '@/utils/request' - -/** - * {FunctionName}分页查询 - * @param {查询条件} data - */ -export function list{ModelTypeName}(query) { - return request({ - url: '{ModuleName}/{ModelTypeName}/list', - method: 'get', - params: query, - }) -} - -/** - * 新增{FunctionName} - * @param data - */ -export function add{ModelTypeName}(data) { - return request({ - url: '{ModuleName}/{ModelTypeName}', - method: 'post', - data: data, - }) -} - -/** - * 修改{FunctionName} - * @param data - */ -export function update{ModelTypeName}(data) { - return request({ - url: '{ModuleName}/{ModelTypeName}', - method: 'PUT', - data: data, - }) -} - -/** - * 获取{FunctionName}详情 - * @param {Id} {FunctionName}Id - */ -export function get{ModelTypeName}(id) { - return request({ - url: '{ModuleName}/{ModelTypeName}/' + id, - method: 'get' - }) -} - -/** - * 删除 - * @param {主键} pid - */ -export function del{ModelTypeName}(pid) { - return request({ - url: '{ModuleName}/{ModelTypeName}/' + pid, - method: 'delete' - }) -} diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt index defbedf..1c604e5 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt @@ -41,7 +41,9 @@ + {VueViewFormContent} +
取 消 @@ -58,13 +60,10 @@ import { del{ModelTypeName}, update{ModelTypeName}, get{ModelTypeName} -} from '@/api/{fileClassName}.js'; - -{VueComponentImport} +} from '@/api/{ModuleName}/{fileClassName}.js'; export default { - name: '{ModelTypeName}', - components: { {VueComponent} }, + name: "{ModelTypeName}", data() { return { labelWidth: "100px", @@ -115,7 +114,7 @@ export default { list{ModelTypeName}(this.addDateRange(this.queryParams, this.timeRange)).then(res => { if (res.code == 200) { this.dataList = res.data.result; - this.total = res.data.totalCount; + this.total = res.data.totalNum; } }) }, @@ -146,7 +145,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map((item) => item.{PrimaryKey}); - this.single = selection.length!=1 + this.single = selection.length != 1 this.multiple = !selection.length; }, /** 搜索按钮操作 */ @@ -172,14 +171,13 @@ export default { this.reset(); const {PrimaryKey} = row.{PrimaryKey} || this.ids; get{ModelTypeName}({PrimaryKey}).then((res) => { - if(res.code == 200){ + if (res.code == 200) { this.form = res.data; this.open = true; this.title = "修改数据"; } }); }, - beforeFileUpload(file) { }, {vueJsMethod} /** 提交按钮 */ submitForm: function () { @@ -187,7 +185,7 @@ export default { if (valid) { console.log(JSON.stringify(this.form)); - if (this.form.{PrimaryKey} != undefined || this.title === '修改数据') { + if (this.form.{PrimaryKey} != undefined || this.title === "修改数据") { update{ModelTypeName}(this.form).then((res) => { if (!res.data) { this.msgError("修改失败"); diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index e409527..ddb9f7e 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Text; +using ZR.CodeGenerator.Model; using ZR.Model.System.Generate; namespace ZR.CodeGenerator @@ -11,36 +12,42 @@ namespace ZR.CodeGenerator public class CodeGenerateTemplate { /// - /// 生成vuejs模板，目前只有上传文件方法 + /// 查询Dto属性 + /// + /// + /// 替换字符对象 + /// + public static void GetQueryDtoProperty(GenTableColumn tbColumn, ReplaceDto replaceDto) + { + if (tbColumn.IsQuery) + { + //字符串类型表达式 + if (tbColumn.CsharpType == GenConstants.TYPE_STRING) + { + replaceDto.QueryCondition += $" predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.{tbColumn.CsharpField}), {QueryExp(tbColumn.CsharpField, tbColumn.QueryType)};\n"; + } + //int类型表达式 + if (CodeGeneratorTool.IsNumber(tbColumn.CsharpType)) + { + replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.{tbColumn.CsharpField} > 0, {QueryExp(tbColumn.CsharpField, tbColumn.QueryType)};\n"; + } + //时间类型 + if (tbColumn.CsharpType == GenConstants.TYPE_DATE) + { + replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.BeginTime != null, it => it.{tbColumn.CsharpField} >= parm.BeginTime);\n"; + replaceDto.QueryCondition += $" predicate = predicate.AndIF(parm.EndTime != null, it => it.{tbColumn.CsharpField} <= parm.EndTime);\n"; + } + } + } + + #region vue 模板 + + /// + /// Vue rules /// /// /// - public static string GetVueJsMethod(GenTableColumn dbFieldInfo) - { - string columnName = dbFieldInfo.ColumnName; - var sb = new StringBuilder(); - - if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) - { - sb.AppendLine($" //文件上传成功方法"); - sb.AppendLine($" handleUpload{dbFieldInfo.CsharpField}Success(res, file) {{"); - sb.AppendLine($" this.form.{columnName} = URL.createObjectURL(file.raw);"); - sb.AppendLine($" // this.$refs.upload.clearFiles();"); - sb.AppendLine($" }},"); - } - //有下拉框选项初列表查询数据 - if ((dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) && !string.IsNullOrEmpty(dbFieldInfo.DictType)) - { - sb.AppendLine(@$" // {dbFieldInfo.ColumnComment}字典翻译"); - sb.AppendLine($" {columnName}Format(row, column) {{"); - sb.AppendLine(@$" return this.selectDictLabel(this.{columnName}Options, row.{columnName});"); - sb.AppendLine(@" },"); - } - return sb.ToString(); - } - - //rules - public static string GetFormRules(GenTableColumn dbFieldInfo) + public static string TplFormRules(GenTableColumn dbFieldInfo) { StringBuilder sbRule = new StringBuilder(); //Rule 规则验证 @@ -55,68 +62,12 @@ namespace ZR.CodeGenerator return sbRule.ToString(); } - //model 属性 - public static string GetModelTemplate(GenTableColumn dbFieldInfo) - { - StringBuilder sbModel = new StringBuilder(); - sbModel.AppendLine(" /// "); - sbModel.AppendLine($" /// 描述 :{dbFieldInfo.ColumnComment}"); - sbModel.AppendLine($" /// 空值 :{!dbFieldInfo.IsRequired}"); - sbModel.AppendLine(" /// "); - if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement) - { - sbModel.AppendLine($" [SqlSugar.SugarColumn(IsPrimaryKey = {dbFieldInfo.IsPk.ToString().ToLower()}, IsIdentity = {dbFieldInfo.IsIncrement.ToString().ToLower()})]"); - } - sbModel.AppendLine($" public {dbFieldInfo.CsharpType}{(GetModelRequired(dbFieldInfo))} {dbFieldInfo.CsharpField} {{ get; set; }}"); - return sbModel.ToString(); - } - public static string GetModelRequired(GenTableColumn dbFieldInfo) - { - string str = ""; - if (!dbFieldInfo.IsRequired && (CodeGeneratorTool.IsNumber(dbFieldInfo.ColumnType) || dbFieldInfo.CsharpType == "DateTime")) - { - str = "?"; - } - - return str; - } - //DTO model - public static string GetDtoProperty(GenTableColumn dbFieldInfo) - { - string InputDtoContent = ""; - if (GenConstants.inputDtoNoField.Any(f => f.Replace("_", "").ToLower().Contains(dbFieldInfo.CsharpField.ToLower().Replace("_", "")))) - { - return InputDtoContent; - } - //else if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME) - //{ - // return InputDtoContent; - //} - else if (dbFieldInfo.IsInsert || dbFieldInfo.IsEdit || dbFieldInfo.IsPk || dbFieldInfo.IsIncrement) - { - InputDtoContent += $" public {dbFieldInfo.CsharpType}{GetModelRequired(dbFieldInfo)} {dbFieldInfo.CsharpField} {{ get; set; }}\r\n"; - } - - return InputDtoContent; - } /// - /// 查询Dto属性 + /// Vue 添加修改表单 /// /// /// - public static string GetQueryDtoProperty(GenTableColumn dbFieldInfo) - { - string QueryDtoContent = ""; - if (dbFieldInfo.IsQuery && !GenConstants.inputDtoNoField.Any(f => f.ToLower().Contains(dbFieldInfo.CsharpField.ToLower()))) - { - QueryDtoContent += $" public {dbFieldInfo.CsharpType} {dbFieldInfo.CsharpField} {{ get; set; }}\r\n"; - } - - return QueryDtoContent; - } - - //form-item - public static string GetVueViewFormContent(GenTableColumn dbFieldInfo) + public static string TplVueFormContent(GenTableColumn dbFieldInfo) { string columnName = dbFieldInfo.ColumnName; string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName); @@ -133,83 +84,103 @@ namespace ZR.CodeGenerator } if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER) { + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); + sb.AppendLine(" "); } else if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME) { //时间 + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); + sb.AppendLine(" "); } else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD) { //图片 + sb.AppendLine(" "); sb.AppendLine($" "); - sb.AppendLine($" "); - sb.AppendLine($" "); - sb.AppendLine(" "); - sb.AppendLine(" "); - sb.AppendLine($" "); + //sb.AppendLine($" "); + //sb.AppendLine($" "); + //sb.AppendLine(" "); + //sb.AppendLine(" "); + //sb.AppendLine($" "); + sb.AppendLine($@" "); sb.AppendLine(" "); + sb.AppendLine(" "); + } + else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO && !string.IsNullOrEmpty(dbFieldInfo.DictType)) + { + string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue"; + sb.AppendLine(" "); + sb.AppendLine($" "); + sb.AppendLine($" "); + sb.AppendLine($" {{{{item.dictLabel}}}}"); + sb.AppendLine(" "); + sb.AppendLine(" "); + sb.AppendLine(" "); } else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) { + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" 是"); sb.AppendLine(" 否"); sb.AppendLine(" "); sb.AppendLine(" "); + sb.AppendLine(" "); } - //else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO && !string.IsNullOrEmpty(dbFieldInfo.DictType)) - //{ - // sb.AppendLine($" "); - // sb.AppendLine($" "); - // //TODO 根据字典类型循环 - // sb.AppendLine(" "); - // sb.AppendLine(" "); - //} else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA) { + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); + sb.AppendLine(" "); } else if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR) { + sb.AppendLine(" "); sb.AppendLine($" "); - sb.AppendLine($" "); + sb.AppendLine($" "); sb.AppendLine(" "); + sb.AppendLine(" "); } else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT && !string.IsNullOrEmpty(dbFieldInfo.DictType)) { string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue"; + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); sb.AppendLine(" "); + sb.AppendLine(" "); } else { string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : ""; + sb.AppendLine(" "); sb.AppendLine($" "); sb.AppendLine($" "); sb.AppendLine(" "); + sb.AppendLine(" "); } return sb.ToString(); } /// - /// 查询表单 + /// Vue 查询表单 /// /// /// - public static string GetQueryFormHtml(GenTableColumn dbFieldInfo) + public static string TplQueryFormHtml(GenTableColumn dbFieldInfo) { StringBuilder sb = new(); string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, dbFieldInfo.ColumnName); @@ -217,29 +188,55 @@ namespace ZR.CodeGenerator if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME) { sb.AppendLine(" "); - sb.AppendLine(" "); + sb.AppendLine(" "); + sb.AppendLine(" "); + } + else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT && !string.IsNullOrEmpty(dbFieldInfo.DictType)) + { + //string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue"; + sb.AppendLine($" "); + sb.AppendLine($" "); + sb.AppendLine($" "); + sb.AppendLine(" "); sb.AppendLine(" "); } else { string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : ""; sb.AppendLine($" "); - sb.AppendLine($" "); + sb.AppendLine($" "); sb.AppendLine(" "); } return sb.ToString(); } - //table-column - public static string GetTableColumn(GenTableColumn dbFieldInfo) + /// + /// Vue 查询列表 + /// + /// + /// + /// + public static string TplTableColumn(GenTableColumn dbFieldInfo, GenTable genTable) { string columnName = dbFieldInfo.ColumnName; string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName); string showToolTip = dbFieldInfo.CsharpType == "string" ? ":show-overflow-tooltip=\"true\"" : ""; string formatter = !string.IsNullOrEmpty(dbFieldInfo.DictType) ? $" :formatter=\"{columnName}Format\"" : ""; StringBuilder sb = new StringBuilder(); - if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) + + //有排序字段 + if (!string.IsNullOrEmpty(genTable?.SortField.ToString()) && genTable?.SortField.ToString() == dbFieldInfo.CsharpField) + { + sb.AppendLine($@" "); + sb.AppendLine(@" "); + sb.AppendLine(@" "); + } + else if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) { sb.AppendLine($" "); sb.AppendLine(" "); sb.AppendLine(" "); } - //else if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_RADIO)) - //{ - // vueViewListContent += $" \r\n"; - // vueViewListContent += " \r\n"; - // vueViewListContent += " \r\n"; - //} else if (dbFieldInfo.IsList) { sb.AppendLine($" "); } return sb.ToString(); } + + #endregion + + public static string QueryExp(string propertyName, string queryType) + { + if (queryType.Equals("EQ")) + { + return $"m => m.{ propertyName} == parm.{propertyName})"; + } + if (queryType.Equals("GTE")) + { + return $"m => m.{ propertyName} >= parm.{propertyName})"; + } + if (queryType.Equals("GT")) + { + return $"m => m.{ propertyName} > parm.{propertyName})"; + } + if (queryType.Equals("LT")) + { + return $"m => m.{ propertyName} < parm.{propertyName})"; + } + if (queryType.Equals("LTE")) + { + return $"m => m.{ propertyName} <= parm.{propertyName})"; + } + if (queryType.Equals("NE")) + { + return $"m => m.{ propertyName} != parm.{propertyName})"; + } + if (queryType.Equals("LIKE")) + { + return $"m => m.{ propertyName}.Contains(parm.{propertyName}))"; + } + return ""; + } } } diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index df7d5d0..eadb973 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -1,10 +1,10 @@ using Infrastructure; +using JinianNet.JNTemplate; using SqlSugar; using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text; using ZR.CodeGenerator.Model; using ZR.Model.System.Generate; @@ -24,11 +24,10 @@ namespace ZR.CodeGenerator /// /// 代码生成器入口方法 /// - /// /// - public static void Generate(GenTable dbTableInfo, GenerateDto dto) + public static void Generate(GenerateDto dto) { - _option.BaseNamespace = dbTableInfo.BaseNameSpace; + _option.BaseNamespace = dto.GenTable.BaseNameSpace; _option.DtosNamespace = _option.BaseNamespace + "Model"; _option.ModelsNamespace = _option.BaseNamespace + "Model"; _option.RepositoriesNamespace = _option.BaseNamespace + "Repository"; @@ -37,128 +36,59 @@ namespace ZR.CodeGenerator _option.ServicesNamespace = _option.BaseNamespace + "Service"; _option.ApiControllerNamespace = _option.BaseNamespace + "Admin.WebApi"; - GenerateSingle(dbTableInfo?.Columns, dbTableInfo, dto); + dto.GenOptions = _option; + GenerateSingle(dto); } /// /// 单表生成代码 /// - /// 表字段集合 - /// 表信息 /// - public static void GenerateSingle(List listField, GenTable tableInfo, GenerateDto dto) + public static void GenerateSingle(GenerateDto dto) { string PKName = "id"; string PKType = "int"; ReplaceDto replaceDto = new(); - replaceDto.ModelTypeName = tableInfo.ClassName;//表名对应C# 实体类名 - replaceDto.TableName = tableInfo.TableName;//表名 - replaceDto.Permission = $"{tableInfo.ModuleName}:{tableInfo.ClassName.ToLower()}";//权限 - replaceDto.ViewsFileName = FirstLowerCase(replaceDto.ModelTypeName); - replaceDto.Author = tableInfo.FunctionAuthor; - - StringBuilder sb1 = new StringBuilder(); - StringBuilder sb2 = new StringBuilder(); - StringBuilder sb3 = new StringBuilder(); + replaceDto.ModelTypeName = dto.GenTable.ClassName;//表名对应C# 实体类名 + replaceDto.PermissionPrefix = $"{dto.GenTable.ModuleName}:{dto.GenTable.ClassName.ToLower()}";//权限 + replaceDto.Author = dto.GenTable.FunctionAuthor; //循环表字段信息 - foreach (GenTableColumn dbFieldInfo in listField) + foreach (GenTableColumn dbFieldInfo in dto.GenTable.Columns) { - string columnName = dbFieldInfo.ColumnName; - - if (dbFieldInfo.IsInsert || dbFieldInfo.IsEdit) - { - replaceDto.VueViewFormResetHtml += $" {columnName}: undefined,\r\n"; - } if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement) { PKName = dbFieldInfo.CsharpField; PKType = dbFieldInfo.CsharpType; } - //编辑字段 - if (dbFieldInfo.IsEdit) + if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) { - replaceDto.UpdateColumn += $" {dbFieldInfo.CsharpField} = model.{dbFieldInfo.CsharpField}, \n"; + replaceDto.UploadFile = 1; } - //新增字段 - if (dbFieldInfo.IsInsert) - { - replaceDto.InsertColumn += $" it.{dbFieldInfo.CsharpField}, \n"; - } - //TODO 查询 - //if (dbFieldInfo.IsQuery) - //{ - // replaceDto.Querycondition += $"predicate = predicate.And(m => m.{dbFieldInfo.CsharpField}.Contains(parm.Name));"; - //} - - if ((dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) && !string.IsNullOrEmpty(dbFieldInfo.DictType)) - { - sb1.AppendLine($" // {dbFieldInfo.ColumnComment}选项列表"); - sb1.AppendLine($" {FirstLowerCase(dbFieldInfo.CsharpField)}Options: [],"); - - sb2.AppendLine($" this.getDicts(\"{dbFieldInfo.DictType}\").then((response) => {{"); - sb2.AppendLine($" this.{FirstLowerCase(dbFieldInfo.CsharpField)}Options = response.data;"); - sb2.AppendLine(" })"); - } - //引用组件 - if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR) - { - replaceDto.VueComponent += "Editor,"; - replaceDto.VueComponentImport += "import Editor from '@/components/Editor';\n"; - } - - replaceDto.QueryProperty += CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo); - replaceDto.ModelProperty += CodeGenerateTemplate.GetModelTemplate(dbFieldInfo); - replaceDto.VueViewFormHtml += CodeGenerateTemplate.GetVueViewFormContent(dbFieldInfo); - replaceDto.VueJsMethod += CodeGenerateTemplate.GetVueJsMethod(dbFieldInfo); - replaceDto.VueViewListHtml += CodeGenerateTemplate.GetTableColumn(dbFieldInfo); - replaceDto.VueViewEditFormRuleContent += CodeGenerateTemplate.GetFormRules(dbFieldInfo); - replaceDto.InputDtoProperty += CodeGenerateTemplate.GetDtoProperty(dbFieldInfo); - replaceDto.VueQueryFormHtml += CodeGenerateTemplate.GetQueryFormHtml(dbFieldInfo); + CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo, replaceDto); + + replaceDto.VueViewFormHtml += CodeGenerateTemplate.TplVueFormContent(dbFieldInfo); + replaceDto.VueViewListHtml += CodeGenerateTemplate.TplTableColumn(dbFieldInfo, dto.GenTable); + replaceDto.VueViewEditFormRuleContent += CodeGenerateTemplate.TplFormRules(dbFieldInfo); + replaceDto.VueQueryFormHtml += CodeGenerateTemplate.TplQueryFormHtml(dbFieldInfo); } - replaceDto.VueDataContent = sb1.ToString(); - replaceDto.MountedMethod = sb2.ToString(); replaceDto.PKName = PKName; replaceDto.PKType = PKType; + replaceDto.FistLowerPk = FirstLowerCase(PKName); + InitJntTemplate(dto, replaceDto); + + GenerateModels(replaceDto, dto); + GenerateInputDto(replaceDto, dto); + GenerateRepository(replaceDto, dto); + GenerateService(replaceDto, dto); + GenerateControllers(replaceDto, dto); + GenerateVueViews(replaceDto, dto); + GenerateVueJs(replaceDto, dto); + GenerateSql(replaceDto, dto); + + if (dto.IsPreview == 1) return; - if (dto.GenCodeFiles.Contains(1)) - { - GenerateModels(replaceDto, dto); - } - if (dto.GenCodeFiles.Contains(2)) - { - GenerateInputDto(replaceDto, dto); - } - if (dto.GenCodeFiles.Contains(3)) - { - GenerateRepository(replaceDto, dto); - } - if (dto.GenCodeFiles.Contains(4)) - { - GenerateIService(replaceDto, dto); - GenerateService(replaceDto, dto); - } - if (dto.GenCodeFiles.Contains(5)) - { - GenerateControllers(replaceDto, dto); - } - if (dto.GenCodeFiles.Contains(6)) - { - GenerateVueViews(replaceDto, dto); - } - if (dto.GenCodeFiles.Contains(7)) - { - GenerateVueJs(replaceDto, dto); - } - if (dto.GenCodeFiles.Contains(8)) - { - GenerateSql(replaceDto, dto); - } - if (dto.IsPreview == 1) - { - return; - } foreach (var item in dto.GenCodes) { FileHelper.WriteAndSave(item.Path, item.Content); @@ -177,20 +107,10 @@ namespace ZR.CodeGenerator // ../ZR.Model/Models/User.cs var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Models", replaceDto.ModelTypeName + ".cs"); - if (File.Exists(fullPath) && !generateDto.Coverd) - return; + var tpl = FileHelper.ReadJtTemplate("TplModel.txt"); + var result = tpl.Render(); - var content = FileHelper.ReadTemplate("ModelTemplate.txt") - .Replace("{ModelsNamespace}", _option.ModelsNamespace) - .Replace("{ModelTypeName}", replaceDto.ModelTypeName) - .Replace("{FunctionName}", generateDto.GenTable.FunctionName) - .Replace("{KeyTypeName}", replaceDto.PKName) - .Replace("{PropertyName}", replaceDto.ModelProperty) - .Replace("{TableName}", replaceDto.TableName) - .Replace("{Author}", replaceDto.Author) - .Replace("{DateTime}", replaceDto.AddTime); - - generateDto.GenCodes.Add(new GenCode(1, "实体类", fullPath, content)); + generateDto.GenCodes.Add(new GenCode(1, "Model", fullPath, result)); } /// @@ -202,20 +122,10 @@ namespace ZR.CodeGenerator { var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Dto", $"{replaceDto.ModelTypeName}Dto.cs"); - if (File.Exists(fullPath) && !generateDto.Coverd) - return; + var tpl = FileHelper.ReadJtTemplate("TplDto.txt"); - var content = FileHelper.ReadTemplate("InputDtoTemplate.txt") - .Replace("{DtosNamespace}", _option.DtosNamespace) - .Replace("{ModelsNamespace}", _option.ModelsNamespace) - .Replace("{FunctionName}", generateDto.GenTable.FunctionName) - .Replace("{PropertyName}", replaceDto.InputDtoProperty) - .Replace("{QueryProperty}", replaceDto.QueryProperty) - .Replace("{ModelTypeName}", replaceDto.ModelTypeName) - .Replace("{Author}", replaceDto.Author) - .Replace("{DateTime}", replaceDto.AddTime); - - generateDto.GenCodes.Add(new GenCode(2, "数据传输实体类", fullPath, content)); + var result = tpl.Render(); + generateDto.GenCodes.Add(new GenCode(2, "Dto", fullPath, result)); } #endregion @@ -229,48 +139,15 @@ namespace ZR.CodeGenerator private static void GenerateRepository(ReplaceDto replaceDto, GenerateDto generateDto) { var fullPath = Path.Combine(generateDto.GenCodePath, _option.RepositoriesNamespace, "Repositories", $"{replaceDto.ModelTypeName}Repository.cs"); + var tpl = FileHelper.ReadJtTemplate("TplRepository.txt"); - if (File.Exists(fullPath) && !generateDto.Coverd) - return; - - var content = FileHelper.ReadTemplate("RepositoryTemplate.txt") - .Replace("{ModelsNamespace}", _option.ModelsNamespace) - .Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace) - .Replace("{ModelTypeName}", replaceDto.ModelTypeName) - .Replace("{FunctionName}", generateDto.GenTable.FunctionName) - .Replace("{TableName}", replaceDto.TableName) - .Replace("{Author}", replaceDto.Author) - .Replace("{DateTime}", replaceDto.AddTime); - - generateDto.GenCodes.Add(new GenCode(3, "仓储层", fullPath, content)); + var result = tpl.Render(); + generateDto.GenCodes.Add(new GenCode(3, "Repository", fullPath, result)); } #endregion #region 生成Service - /// - /// 生成IService文件 - /// - /// - /// 替换实体 - private static void GenerateIService(ReplaceDto replaceDto, GenerateDto generateDto) - { - var fullPath = Path.Combine(generateDto.GenCodePath, _option.IServicsNamespace, "Business", "IBusService", $"I{replaceDto.ModelTypeName}Service.cs"); - - if (File.Exists(fullPath) && !generateDto.Coverd) - return; - var content = FileHelper.ReadTemplate("IServiceTemplate.txt") - .Replace("{ModelsNamespace}", _option.ModelsNamespace) - .Replace("{FunctionName}", generateDto.GenTable.FunctionName) - .Replace("{DtosNamespace}", _option.DtosNamespace) - .Replace("{IServicsNamespace}", _option.IServicsNamespace) - .Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace) - .Replace("{ModelTypeName}", replaceDto.ModelTypeName) - .Replace("{Author}", replaceDto.Author) - .Replace("{DateTime}", replaceDto.AddTime); - - generateDto.GenCodes.Add(new GenCode(4, "接口层", fullPath, content)); - } /// /// 生成Service文件 @@ -278,22 +155,16 @@ namespace ZR.CodeGenerator private static void GenerateService(ReplaceDto replaceDto, GenerateDto generateDto) { var fullPath = Path.Combine(generateDto.GenCodePath, _option.ServicesNamespace, "Business", $"{replaceDto.ModelTypeName}Service.cs"); + var tpl = FileHelper.ReadJtTemplate("TplService.txt"); - if (File.Exists(fullPath) && !generateDto.Coverd) - return; + var result = tpl.Render(); + generateDto.GenCodes.Add(new GenCode(4, "Service", fullPath, result)); - var content = FileHelper.ReadTemplate("ServiceTemplate.txt") - .Replace("{IRepositoriesNamespace}", _option.IRepositoriesNamespace) - .Replace("{DtosNamespace}", _option.DtosNamespace) - .Replace("{IServicsNamespace}", _option.IServicsNamespace) - .Replace("{FunctionName}", generateDto.GenTable.FunctionName) - .Replace("{ModelsNamespace}", _option.ModelsNamespace) - .Replace("{ServicesNamespace}", _option.ServicesNamespace) - .Replace("{ModelTypeName}", replaceDto.ModelTypeName) - .Replace("{Author}", replaceDto.Author) - .Replace("{DateTime}", replaceDto.AddTime); + var fullPath2 = Path.Combine(generateDto.GenCodePath, _option.IServicsNamespace, "Business", "IBusService", $"I{replaceDto.ModelTypeName}Service.cs"); + var tpl2 = FileHelper.ReadJtTemplate("TplIService.txt"); - generateDto.GenCodes.Add(new GenCode(4, "服务层", fullPath, content)); + var result2 = tpl2.Render(); + generateDto.GenCodes.Add(new GenCode(4, "IService", fullPath2, result2)); } #endregion @@ -305,31 +176,11 @@ namespace ZR.CodeGenerator private static void GenerateControllers(ReplaceDto replaceDto, GenerateDto generateDto) { var fullPath = Path.Combine(generateDto.GenCodePath, _option.ApiControllerNamespace, "Controllers", generateDto.GenTable.ModuleName, $"{replaceDto.ModelTypeName}Controller.cs"); - if (File.Exists(fullPath) && !generateDto.Coverd) - return; - - var content = FileHelper.ReadTemplate("ControllersTemplate.txt") - .Replace("{ApiControllerNamespace}", _option.ApiControllerNamespace) - .Replace("{ServicesNamespace}", _option.ServicesNamespace) - .Replace("{ModelsNamespace}", _option.ModelsNamespace) - .Replace("{FunctionName}", generateDto.GenTable.FunctionName) - .Replace("{ModelName}", replaceDto.ModelTypeName) - .Replace("{Permission}", replaceDto.Permission) - .Replace("{PrimaryKey}", replaceDto.PKName) - .Replace("{ModuleName}", generateDto.GenTable.ModuleName) - .Replace("{PKCsharpType}", replaceDto.PKType) - .Replace("{Author}", replaceDto.Author) - .Replace("{DateTime}", replaceDto.AddTime); - - if (replaceDto.UpdateColumn != null) - { - content = content.Replace("{UpdateColumn}", replaceDto.UpdateColumn.TrimEnd('\n')); - } - if (replaceDto.InsertColumn != null) - { - content = content.Replace("{InsertColumn}", replaceDto.InsertColumn.TrimEnd('\n')); - } - generateDto.GenCodes.Add(new GenCode(5, "控制器", fullPath, content)); + var tpl = FileHelper.ReadJtTemplate("TplControllers.txt"); + + tpl.Set("QueryCondition", replaceDto.QueryCondition); + var result = tpl.Render(); + generateDto.GenCodes.Add(new GenCode(5, "Controller", fullPath, result)); } #endregion @@ -338,28 +189,17 @@ namespace ZR.CodeGenerator /// 6、生成Vue页面 private static void GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto) { - var fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName, replaceDto.ViewsFileName, "index.vue"); + var fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName, $"{generateDto.GenTable.BusinessName}.vue"); - if (File.Exists(fullPath) && !generateDto.Coverd) - return; + var tpl = FileHelper.ReadJtTemplate("TplVue.txt"); + tpl.Set("vueQueryFormHtml", replaceDto.VueQueryFormHtml); + tpl.Set("VueViewEditFormRuleContent", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则 + tpl.Set("VueViewFormContent", replaceDto.VueViewFormHtml);//添加、修改表单 + tpl.Set("VueViewListContent", replaceDto.VueViewListHtml);//查询 table列 + tpl.Set("lowerBusinessName", FirstLowerCase(generateDto.GenTable.BusinessName)); - var content = FileHelper.ReadTemplate("VueTemplate.txt") - .Replace("{fileClassName}", replaceDto.ViewsFileName) - .Replace("{VueViewListContent}", replaceDto.VueViewListHtml)//查询 table列 - .Replace("{VueViewFormContent}", replaceDto.VueViewFormHtml)//添加、修改表单 - .Replace("{ModelTypeName}", replaceDto.ModelTypeName) - .Replace("{Permission}", replaceDto.Permission) - .Replace("{VueViewFormResetHtml}", replaceDto.VueViewFormResetHtml) - .Replace("{vueJsMethod}", replaceDto.VueJsMethod) - .Replace("{vueQueryFormHtml}", replaceDto.VueQueryFormHtml) - .Replace("{VueDataContent}", replaceDto.VueDataContent) - .Replace("{PrimaryKey}", FirstLowerCase(replaceDto.PKName)) - .Replace("{MountedMethod}", replaceDto.MountedMethod) - .Replace("{VueComponent}", replaceDto.VueComponent.TrimEnd(',')) - .Replace("{VueComponentImport}", replaceDto.VueComponentImport) - .Replace("{VueViewEditFormRuleContent}", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则 - - generateDto.GenCodes.Add(new GenCode(6, "index.vue", fullPath, content)); + var result = tpl.Render(); + generateDto.GenCodes.Add(new GenCode(6, "index.vue", fullPath, result)); } /// /// 7、生成vue页面api @@ -369,29 +209,21 @@ namespace ZR.CodeGenerator /// public static void GenerateVueJs(ReplaceDto replaceDto, GenerateDto generateDto) { - string fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "api", replaceDto.ViewsFileName + ".js"); + string fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "api", generateDto.GenTable.ModuleName, FirstLowerCase(generateDto.GenTable.BusinessName) + ".js"); + var tpl = FileHelper.ReadJtTemplate("TplVueApi.txt"); - if (File.Exists(fullPath) && !generateDto.Coverd) - return; - - var content = FileHelper.ReadTemplate("VueJsTemplate.txt") - .Replace("{ModelTypeName}", replaceDto.ModelTypeName) - .Replace("{FunctionName}", generateDto.GenTable.FunctionName) - .Replace("{ModuleName}", generateDto.GenTable.ModuleName); - - generateDto.GenCodes.Add(new GenCode(7, "api.js", fullPath, content)); + var result = tpl.Render(); + generateDto.GenCodes.Add(new GenCode(7, "api.js", fullPath, result)); } #endregion - #region 8、生成SQL + #region 生成SQL public static void GenerateSql(ReplaceDto replaceDto, GenerateDto generateDto) { - string fullPath = Path.Combine(generateDto.GenCodePath, replaceDto.ViewsFileName + ".sql"); + string fullPath = Path.Combine(generateDto.GenCodePath, generateDto.GenTable.BusinessName + ".sql"); - if (File.Exists(fullPath) && !generateDto.Coverd) - return; var tempName = ""; switch (generateDto.DbType) { @@ -404,15 +236,10 @@ namespace ZR.CodeGenerator default: break; } - var content = FileHelper.ReadTemplate($"{tempName}.txt") - .Replace("{ModelTypeName}", replaceDto.ModelTypeName) - .Replace("{Permission}", replaceDto.Permission) - .Replace("{ModuleName}", generateDto.GenTable.ModuleName) - .Replace("{ViewsFileName}", replaceDto.ViewsFileName) - .Replace("{ParentId}", generateDto.ParentMenuId.ToString()) - .Replace("{FunctionName}", generateDto.GenTable.FunctionName); - - generateDto.GenCodes.Add(new GenCode(8, "sql", fullPath, content)); + var tpl = FileHelper.ReadJtTemplate($"{tempName}.txt"); + tpl.Set("parentId", generateDto.GenTable.ParentMenuId ?? 0); + var result = tpl.Render(); + generateDto.GenCodes.Add(new GenCode(8, "sql", fullPath, result)); } #endregion @@ -444,6 +271,19 @@ namespace ZR.CodeGenerator return tableName.Substring(0, 1).ToUpper() + tableName[1..].Replace("_", ""); } + /// + /// 获取业务名 + /// + /// tableName 表名 + /// 业务名 + public static string GetBusinessName(string tableName) + { + int lastIndex = tableName.LastIndexOf("_"); + int nameLength = tableName.Length; + string businessName = tableName[(nameLength - lastIndex + 1)..]; + return businessName.ToLower(); + } + /// /// 首字母转小写，输出前端 /// @@ -464,6 +304,34 @@ namespace ZR.CodeGenerator { return string.IsNullOrEmpty(columnDescription) ? columnName : columnDescription; } + /// + /// 获取C# 类型 + /// + /// + /// + public static string GetCSharpDatatype(string sDatatype) + { + sDatatype = sDatatype.ToLower(); + string sTempDatatype = sDatatype switch + { + "int" or "number" or "integer" or "smallint" => "int", + "bigint" => "long", + "tinyint" => "byte", + "numeric" or "real" or "float" => "float", + "decimal" or "numer(8,2)" or "numeric" => "decimal", + "bit" => "bool", + "date" or "datetime" or "datetime2" or "smalldatetime" or "timestamp" => "DateTime", + "money" or "smallmoney" => "decimal", + _ => "string", + }; + return sTempDatatype; + } + + public static bool IsNumber(string tableDataType) + { + string[] arr = new string[] { "int", "long" }; + return arr.Any(f => f.Contains(GetCSharpDatatype(tableDataType))); + } #endregion /// @@ -519,7 +387,7 @@ namespace ZR.CodeGenerator genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA; } //编辑字段 - if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) ) + if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f))) { genTableColumn.IsEdit = false; } @@ -535,32 +403,29 @@ namespace ZR.CodeGenerator } /// - /// 获取C# 类型 + /// 初始化Jnt模板 /// - /// - /// - public static string GetCSharpDatatype(string sDatatype) + /// + /// + private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto) { - sDatatype = sDatatype.ToLower(); - string sTempDatatype = sDatatype switch + Engine.Current.Clean(); + + //jnt模板引擎全局变量 + Engine.Configure((options) => { - "int" or "number" or "integer" or "smallint" => "int", - "bigint" => "long", - "tinyint" => "byte", - "numeric" or "real" or "float" => "float", - "decimal" or "numer(8,2)" => "decimal", - "bit" => "bool", - "date" or "datetime" or "datetime2" or "smalldatetime" => "DateTime", - "money" or "smallmoney" => "double", - _ => "string", - }; - return sTempDatatype; + options.TagPrefix = "${"; + options.TagSuffix = "}"; + options.TagFlag = '$'; + options.OutMode = OutMode.Auto; + //options.DisableeLogogram = true;//禁用简写 + options.Data.Set("refs", "$");//特殊标签替换 + options.Data.Set("replaceDto", replaceDto); + options.Data.Set("options", dto.GenOptions); + options.Data.Set("genTable", dto.GenTable); + //...其它数据 + }); } - public static bool IsNumber(string tableDataType) - { - string[] arr = new string[] { "int", "long" }; - return arr.Any(f => f.Contains(GetCSharpDatatype(tableDataType))); - } } } diff --git a/ZR.CodeGenerator/DbProvider.cs b/ZR.CodeGenerator/DbProvider.cs index 71982e1..ee7a98f 100644 --- a/ZR.CodeGenerator/DbProvider.cs +++ b/ZR.CodeGenerator/DbProvider.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; namespace ZR.CodeGenerator @@ -24,11 +25,11 @@ namespace ZR.CodeGenerator { string connStr = ConfigUtils.Instance.GetConfig(GenConstants.Gen_conn); int dbType = ConfigUtils.Instance.GetAppConfig(GenConstants.Gen_conn_dbType, 0); - connStr = connStr.Replace("{database}", dbName); - if (string.IsNullOrEmpty(dbName)) + + if (!string.IsNullOrEmpty(dbName)) { - connStr = ConfigUtils.Instance.GetConnectionStrings(OptionsSetting.ConnAdmin); - dbType = ConfigUtils.Instance.GetAppConfig(OptionsSetting.ConnDbType); + string replaceStr = GetValue(connStr, "database=", ";"); + connStr = connStr.Replace(replaceStr, dbName); } var db = new SqlSugarScope(new List() { @@ -43,5 +44,18 @@ namespace ZR.CodeGenerator CodeDb = db; return db; } + + /// + /// 获得字符串中开始和结束字符串中间得值 + /// + /// 字符串 + /// 开始 + /// 结束 + /// + public static string GetValue(string str, string s, string e) + { + Regex rg = new Regex("(?<=(" + s + "))[.\\s\\S]*?(?=(" + e + "))", RegexOptions.Multiline | RegexOptions.Singleline); + return rg.Match(str).Value; + } } } diff --git a/ZR.CodeGenerator/FileHelper.cs b/ZR.CodeGenerator/FileHelper.cs index 6d1e32d..13a4ac5 100644 --- a/ZR.CodeGenerator/FileHelper.cs +++ b/ZR.CodeGenerator/FileHelper.cs @@ -1,4 +1,5 @@ -using System; +using JinianNet.JNTemplate; +using System; using System.Collections.Generic; using System.IO; using System.IO.Compression; @@ -108,6 +109,16 @@ namespace ZR.CodeGenerator return str; } + public static ITemplate ReadJtTemplate(string tplName) + { + string path = Environment.CurrentDirectory; + string fullName = Path.Combine(path, "wwwroot", "CodeGenTemplate", tplName); + if (File.Exists(fullName)) + { + return Engine.LoadTemplate(fullName); + } + return null; + } /// /// 压缩代码 diff --git a/ZR.CodeGenerator/GenConstants.cs b/ZR.CodeGenerator/GenConstants.cs index 65d2e9f..a32f4dc 100644 --- a/ZR.CodeGenerator/GenConstants.cs +++ b/ZR.CodeGenerator/GenConstants.cs @@ -64,10 +64,6 @@ namespace ZR.CodeGenerator /** 数据库时间类型 */ public static string[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" }; - /** 数据库数字类型 */ - public static string[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer", - "bit", "bigint", "float", "double", "decimal" }; - /** 页面不需要编辑字段 */ public static string[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "delFlag" }; @@ -127,7 +123,7 @@ namespace ZR.CodeGenerator public static string TYPE_DOUBLE = "Double"; /** 时间类型 */ - public static string TYPE_DATE = "Date"; + public static string TYPE_DATE = "DateTime"; /** 模糊查询 */ public static string QUERY_LIKE = "LIKE"; diff --git a/ZR.CodeGenerator/Model/GenerateDto.cs b/ZR.CodeGenerator/Model/GenerateDto.cs index e81020f..3554346 100644 --- a/ZR.CodeGenerator/Model/GenerateDto.cs +++ b/ZR.CodeGenerator/Model/GenerateDto.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using ZR.Model.System.Generate; namespace ZR.CodeGenerator.Model @@ -10,24 +6,16 @@ namespace ZR.CodeGenerator.Model public class GenerateDto { public long TableId { get; set; } - //public string[] QueryColumn { get; set; } /// /// 是否预览代码 /// public int IsPreview { get; set; } /// - /// 要生成的文件 - /// - public int[] GenCodeFiles { get; set; } - /// - /// 如果目标文件存在，是否覆盖。默认为false - /// - public bool Coverd { get; set; } = true; - /// /// 生成代码的数据库类型 0、mysql 1、sqlserver /// public int DbType { get; set; } public GenTable GenTable { get; set; } + public CodeGenerateOption GenOptions { get; set; } #region 存储路径 /// /// 代码模板预览存储路径存放 @@ -45,10 +33,6 @@ namespace ZR.CodeGenerator.Model /// 代码生成压缩包名称 /// public string ZipFileName { get; set; } - /// - /// 父级菜单id - /// - public long ParentMenuId { get; set; } #endregion } diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/ZR.CodeGenerator/Model/ReplaceDto.cs index dfe538d..64da250 100644 --- a/ZR.CodeGenerator/Model/ReplaceDto.cs +++ b/ZR.CodeGenerator/Model/ReplaceDto.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace ZR.CodeGenerator.Model { @@ -13,40 +9,21 @@ namespace ZR.CodeGenerator.Model /// public string PKName { get; set; } /// + /// 首字母小写主键 + /// + public string FistLowerPk{ get; set; } + /// /// 主键类型 /// public string PKType { get; set; } /// /// 控制器权限 /// - public string Permission { get; set; } + public string PermissionPrefix { get; set; } /// /// C#类名 /// public string ModelTypeName { get; set; } - /// - /// 数据库表名 - /// - public string TableName { get; set; } - /// - /// 修改列 - /// - public string UpdateColumn { get; set; } - /// - /// 插入列 - /// - public string InsertColumn { get; set; } - - - /// - /// 实体属性模板 - /// - public string ModelProperty { get; set; } - /// - /// 输入Dto模板 - /// - public string InputDtoProperty { get; set; } - //vue、api public string VueViewFormResetHtml { get; set; } /// @@ -61,10 +38,7 @@ namespace ZR.CodeGenerator.Model /// 前端搜索表单html /// public string VueQueryFormHtml { get; set; } - /// - /// vue js方法 - /// - public string VueJsMethod { get; set; } + /// /// vue 添加、编辑表单规则 /// @@ -72,31 +46,13 @@ namespace ZR.CodeGenerator.Model /// /// 查询条件 /// - public string QueryCondition { get; set; } + public string QueryCondition { get; set; } = ""; + /// - /// 查询属性 + /// 上传URL data /// - public string QueryProperty { get; set; } - /// - /// vue data内容 - /// - public string VueDataContent { get; set; } - /// - /// vue mounted 方法 - /// - public string MountedMethod { get; set; } - /// - /// views、js文件名 - /// - public string ViewsFileName { get; set; } - /// - /// vue组件引用 - /// - public string VueComponent { get; set; } = ""; - /// - /// vue组件导入 - /// - public string VueComponentImport { get; set; } = ""; + //public string VueUploadUrl { get; set; } + public int UploadFile { get; set; } = 0; public string Author { get; set; } public string AddTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd"); } diff --git a/ZR.CodeGenerator/ZR.CodeGenerator.csproj b/ZR.CodeGenerator/ZR.CodeGenerator.csproj index 99e3b60..fa433ba 100644 --- a/ZR.CodeGenerator/ZR.CodeGenerator.csproj +++ b/ZR.CodeGenerator/ZR.CodeGenerator.csproj @@ -11,13 +11,7 @@ + - - - - PreserveNewest - - - diff --git a/ZR.Common/AliyunOssHelper.cs b/ZR.Common/AliyunOssHelper.cs new file mode 100644 index 0000000..8510317 --- /dev/null +++ b/ZR.Common/AliyunOssHelper.cs @@ -0,0 +1,47 @@ +using Aliyun.OSS; +using Aliyun.OSS.Common; +using Infrastructure; +using System; +using System.IO; + +namespace ZR.Common +{ + public class AliyunOssHelper + { + static string accessKeyId = ConfigUtils.Instance.GetConfig("ALIYUN_OSS:KEY"); + static string accessKeySecret = ConfigUtils.Instance.GetConfig("ALIYUN_OSS:SECRET"); + static string endpoint = ConfigUtils.Instance.GetConfig("ALIYUN_OSS:REGIONID"); + static string bucketName1 = ConfigUtils.Instance.GetConfig("ALIYUN_OSS:bucketName"); + + /// + /// 上传到阿里云 + /// + /// + /// 存储路径 eg： upload/2020/01/01/xxx.png + /// 存储桶 如果为空默认取配置文件 + public static System.Net.HttpStatusCode PutObjectFromFile(Stream filestreams, string dirPath, string bucketName = "") + { + OssClient client = new OssClient(endpoint, accessKeyId, accessKeySecret); + if (string.IsNullOrEmpty(bucketName)) { bucketName = bucketName1; } + try + { + dirPath = dirPath.Replace("\\", "/"); + PutObjectResult putObjectResult = client.PutObject(bucketName, dirPath, filestreams); + // Console.WriteLine("Put object:{0} succeeded", directory); + + return putObjectResult.HttpStatusCode; + } + catch (OssException ex) + { + Console.WriteLine("Failed with error code: {0}; Error info: {1}. \nRequestID:{2}\tHostID:{3}", + ex.ErrorCode, ex.Message, ex.RequestId, ex.HostId); + } + catch (Exception ex) + { + Console.WriteLine("Failed with error info: {0}", ex.Message); + } + return System.Net.HttpStatusCode.BadRequest; + } + + } +} diff --git a/ZR.Common/Tools.cs b/ZR.Common/Tools.cs index b33d9e6..1215a39 100644 --- a/ZR.Common/Tools.cs +++ b/ZR.Common/Tools.cs @@ -14,6 +14,7 @@ namespace ZR.Common public static long[] SpitLongArrary(string str) { if (string.IsNullOrEmpty(str)) { return Array.Empty(); } + str = str.TrimStart(',').TrimEnd(','); string[] strIds = str.Split(',', (char)StringSplitOptions.RemoveEmptyEntries); long[] infoIdss = Array.ConvertAll(strIds, s => long.Parse(s)); return infoIdss; diff --git a/ZR.Common/ZR.Common.csproj b/ZR.Common/ZR.Common.csproj index 988d309..1bffb47 100644 --- a/ZR.Common/ZR.Common.csproj +++ b/ZR.Common/ZR.Common.csproj @@ -5,7 +5,12 @@ + + + + + diff --git a/ZR.Model/ApiResult.cs b/ZR.Model/ApiResult.cs deleted file mode 100644 index 462f8e0..0000000 --- a/ZR.Model/ApiResult.cs +++ /dev/null @@ -1,103 +0,0 @@ -using Newtonsoft.Json; -using System.ComponentModel; - -namespace ZRModel -{ - /// - /// 通用json格式实体返回类 - /// Author by zhaorui - /// - public class ApiResult - { - public int Code { get; set; } - public string Msg { get; set; } - /// - /// 如果data值为null，则忽略序列化将不会返回data字段 - /// - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public object Data { get; set; } - - public ApiResult() - { - Code = 0; - Msg = "fail"; - } - - public ApiResult OnSuccess() - { - Code = 100; - Msg = "success"; - return this; - } - public ApiResult(int code, string msg, object data = null) - { - Code = code; - Msg = msg; - Data = data; - } - - public ApiResult OnSuccess(object data = null) - { - Code = (int)ResultCode.SUCCESS; - Msg = "SUCCESS"; - Data = data; - return this; - } - - /// - /// 返回成功消息 - /// - /// 数据对象 - /// 成功消息 - public static ApiResult Success(object data) { return new ApiResult(100, "success", data); } - - /// - /// 返回成功消息 - /// - /// 返回内容 - /// 成功消息 - public static ApiResult Success(string msg) { return new ApiResult(100, msg, null); } - - /// - /// 返回成功消息 - /// - /// 返回内容 - /// 数据对象 - /// 成功消息 - public static ApiResult Success(string msg, object data) { return new ApiResult(100, msg, data); } - - /// - /// 返回失败消息 - /// - /// - /// - /// - public static ApiResult Error(int code, string msg) { return new ApiResult(code, msg); } - - /// - /// 返回失败消息 - /// - /// - /// - public static ApiResult Error(string msg) { return new ApiResult(200, msg); } - - } - public enum ResultCode - { - [Description("success")] - SUCCESS = 100, - [Description("参数错误")] - PARAM_ERROR = 101, - [Description("自定义错误")] - CUSTOM_ERROR = 200, - FAIL = 0, - [Description("程序出错啦")] - GLOBAL_ERROR = 104, - [Description("请先绑定手机号")] - NOBIND_PHONENUM = 102, - [Description("授权失败")] - OAUTH_FAIL = 201, - [Description("未授权")] - DENY = 401 - } -} diff --git a/ZR.Model/Dto/GendemoDto.cs b/ZR.Model/Dto/GendemoDto.cs deleted file mode 100644 index 7f86d2a..0000000 --- a/ZR.Model/Dto/GendemoDto.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using ZR.Model.Dto; -using ZR.Model.Models; - -namespace ZR.Model.Dto -{ - /// - /// 代码生成演示输入对象模型 - /// - public class GendemoDto - { - public int Id { get; set; } - public string Name { get; set; } - public string Icon { get; set; } - public int ShowStatus { get; set; } - public int? Sex { get; set; } - public int? Sort { get; set; } - public DateTime? BeginTime { get; set; } - public DateTime? EndTime { get; set; } - public string Remark { get; set; } - - } - - /// - /// 代码生成演示查询对象模型 - /// - public class GendemoQueryDto: PagerInfo - { - - public DateTime? BeginTime { get; set; } - public DateTime? EndTime { get; set; } - } -} diff --git a/ZR.Model/Extensions/QueryableExtension.cs b/ZR.Model/Extensions/QueryableExtension.cs new file mode 100644 index 0000000..22a491f --- /dev/null +++ b/ZR.Model/Extensions/QueryableExtension.cs @@ -0,0 +1,30 @@ +using System.Collections.Generic; + +namespace ZR.Model +{ + /// + /// 分页扩展 + /// + public static class PageExtension + { + /// + /// 读取列表 + /// + /// + /// + /// + /// + public static PagedInfo ToPage(this List source, PagerInfo parm) + { + var page = new PagedInfo + { + TotalPage = parm.TotalPage, + TotalNum = parm.TotalNum, + PageSize = parm.PageSize, + PageIndex = parm.PageNum, + Result = source + }; + return page; + } + } +} diff --git a/ZR.Model/Models/Gendemo.cs b/ZR.Model/Models/Gendemo.cs deleted file mode 100644 index 0ba1695..0000000 --- a/ZR.Model/Models/Gendemo.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ZR.Model.Models -{ - /// - /// 代码生成演示，数据实体对象 - /// - /// @author zr - /// @date 2021-11-24 - /// - [SqlSugar.SugarTable("gen_demo")] - public class Gendemo - { - /// - /// 描述 :自增id - /// 空值 :False - /// - [SqlSugar.SugarColumn(IsPrimaryKey = false, IsIdentity = true)] - public int Id { get; set; } - /// - /// 描述 :名称 - /// 空值 :True - /// - public string Name { get; set; } - /// - /// 描述 :图片 - /// 空值 :True - /// - public string Icon { get; set; } - /// - /// 描述 :显示状态 - /// 空值 :False - /// - public int ShowStatus { get; set; } - /// - /// 描述 :添加时间 - /// 空值 :True - /// - public DateTime? AddTime { get; set; } - /// - /// 描述 :用户性别 - /// 空值 :True - /// - public int? Sex { get; set; } - /// - /// 描述 :排序 - /// 空值 :True - /// - public int? Sort { get; set; } - /// - /// 描述 :开始时间 - /// 空值 :True - /// - public DateTime? BeginTime { get; set; } - /// - /// 描述 :结束时间 - /// 空值 :True - /// - public DateTime? EndTime { get; set; } - /// - /// 描述 :备注 - /// 空值 :True - /// - public string Remark { get; set; } - - } -} diff --git a/ZR.Model/OptionsSetting.cs b/ZR.Model/OptionsSetting.cs deleted file mode 100644 index 8c723fc..0000000 --- a/ZR.Model/OptionsSetting.cs +++ /dev/null @@ -1,50 +0,0 @@ - -namespace ZRModel -{ - /// - /// 获取配置文件POCO实体类 - /// - public class OptionsSetting - { - /// - /// 1、喵播 2、fireStar - /// - public int Platform { get; set; } - public string AppName { get; set; } - public string Redis { get; set; } - public string Conn_Live { get; set; } - public string Conn_Admin { get; set; } - /// - /// mongodb连接字符串 - /// - public string Mongo_Conn { get; set; } - public string Database { get; set; } - - public LoggingOptions Logging { get; set; } - public MailOptions MailOptions { get; set; } - } - /// - /// 发送邮件数据配置 - /// - public class MailOptions - { - public string From { get; set; } - public string Password { get; set; } - public string Host { get; set; } - public int Port { get; set; } - } - /// - /// 日志 - /// - public class LoggingOptions - { - public LogLevelOptions LogLevel { get; set; } - } - public class LogLevelOptions - { - public string Default { get; set; } - public string Ssytem { get; set; } - public string Microsoft { get; set; } - } - -} diff --git a/Infrastructure/Model/PagedInfo.cs b/ZR.Model/PagedInfo.cs similarity index 55% rename from Infrastructure/Model/PagedInfo.cs rename to ZR.Model/PagedInfo.cs index ff5c285..747deea 100644 --- a/Infrastructure/Model/PagedInfo.cs +++ b/ZR.Model/PagedInfo.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Infrastructure.Model +namespace ZR.Model { /// /// 分页参数 @@ -20,34 +20,33 @@ namespace Infrastructure.Model /// /// 排序列 /// - //public string Sort { get; set; } + public string Sort { get; set; } /// /// 排序类型 /// - //public string SortType { get; set; } + public string SortType { get; set; } /// /// 总记录数 /// - public int TotalCount { get; set; } + public int TotalNum { get; set; } /// /// 总页数 /// - //public int TotalPage - //{ - // get - // { - // if (TotalCount > 0) - // { - // return TotalCount % this.PageSize == 0 ? TotalCount / this.PageSize : TotalCount / this.PageSize + 1; - // } - // else - // { - // return 0; - // } - // } - // set { } - //} - public int TotalPage { get; set; } + public int TotalPage + { + get + { + if (TotalNum > 0) + { + return TotalNum % this.PageSize == 0 ? TotalNum / this.PageSize : TotalNum / this.PageSize + 1; + } + else + { + return 0; + } + } + set { } + } public List Result { get; set; } public PagedInfo() @@ -59,8 +58,8 @@ namespace Infrastructure.Model { PageIndex = pageIndex; PageSize = pageSize; - TotalCount = source.Count; - TotalPage = (int)Math.Ceiling(TotalCount / (double)PageSize);//计算总页数 + TotalNum = source.Count; + TotalPage = (int)Math.Ceiling(TotalNum / (double)PageSize);//计算总页数 } } diff --git a/ZR.Model/PagerInfo.cs b/ZR.Model/PagerInfo.cs index f3921ef..caefd5b 100644 --- a/ZR.Model/PagerInfo.cs +++ b/ZR.Model/PagerInfo.cs @@ -18,9 +18,20 @@ namespace ZR.Model /// /// 总页码 /// - public int TotalPageNum { get; set; } + /// + /// 总页数 + /// + public int TotalPage + { + get + { + return TotalNum > 0 ? TotalNum % PageSize == 0 ? TotalNum / PageSize : TotalNum / PageSize + 1 : 0; + } + set { } + } public int PageSize { get => pageSize; set => pageSize = value; } - + public string Sort { get; set; } + public string OrderBy { get; set; } public PagerInfo() { PageNum = 1; diff --git a/ZR.Model/System/Article.cs b/ZR.Model/System/Article.cs index cffa116..f82f626 100644 --- a/ZR.Model/System/Article.cs +++ b/ZR.Model/System/Article.cs @@ -1,4 +1,5 @@ -using System; +using SqlSugar; +using System; using System.Collections.Generic; using System.Text; @@ -8,6 +9,7 @@ namespace ZR.Model.System /// 文章表 /// [SqlSugar.SugarTable("article")] + [Tenant("0")] public class Article { [SqlSugar.SugarColumn(IsIdentity = true, IsPrimaryKey = true)] diff --git a/ZR.Model/System/ArticleCategory.cs b/ZR.Model/System/ArticleCategory.cs index bd395d0..48c9d6d 100644 --- a/ZR.Model/System/ArticleCategory.cs +++ b/ZR.Model/System/ArticleCategory.cs @@ -1,4 +1,5 @@ using Newtonsoft.Json; +using SqlSugar; using System; using System.Collections.Generic; using System.Text; @@ -8,7 +9,8 @@ namespace ZR.Model.System /// /// 文章目录 /// - [SqlSugar.SugarTable("articleCategory")] + [SugarTable("articleCategory")] + [Tenant("0")] public class ArticleCategory { public int Category_Id { get; set; } @@ -16,7 +18,7 @@ namespace ZR.Model.System public int ParentId { get; set; } [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - [SqlSugar.SugarColumn(IsIgnore = true)] + [SugarColumn(IsIgnore = true)] public List Children { get; set; } } } diff --git a/ZR.Model/System/Dto/GenTableDto.cs b/ZR.Model/System/Dto/GenTableDto.cs index 36986c3..e534095 100644 --- a/ZR.Model/System/Dto/GenTableDto.cs +++ b/ZR.Model/System/Dto/GenTableDto.cs @@ -24,7 +24,9 @@ namespace ZR.Model.System.Dto /// /// 上级菜单id /// - public int ParentMenuId { get; set; } + public int? ParentMenuId { get; set; } + public string SortField { get; set; } + public string SortType { get; set; } public List Columns { get; set; } } diff --git a/ZR.Model/System/Dto/SysConfigDto.cs b/ZR.Model/System/Dto/SysConfigDto.cs index 02ecefc..6547982 100644 --- a/ZR.Model/System/Dto/SysConfigDto.cs +++ b/ZR.Model/System/Dto/SysConfigDto.cs @@ -1,7 +1,4 @@ using System; -using System.Collections.Generic; -using ZR.Model.Dto; -using ZR.Model.Models; namespace ZR.Model.Dto { @@ -15,6 +12,7 @@ namespace ZR.Model.Dto public string ConfigKey { get; set; } public string ConfigValue { get; set; } public string ConfigType { get; set; } + public string Remark { get; set; } } /// diff --git a/ZR.Model/System/Generate/GenTable.cs b/ZR.Model/System/Generate/GenTable.cs index d2cd238..6bbdd16 100644 --- a/ZR.Model/System/Generate/GenTable.cs +++ b/ZR.Model/System/Generate/GenTable.cs @@ -8,7 +8,8 @@ namespace ZR.Model.System.Generate /// 代码生成表 /// [SqlSugar.SugarTable("gen_table")] - public class GenTable: SysBase + [SqlSugar.Tenant("0")] + public class GenTable : SysBase { /// /// 表id @@ -68,8 +69,18 @@ namespace ZR.Model.System.Generate /// public string Options { get; set; } + #region 表额外字段 /** 表列信息 */ [SqlSugar.SugarColumn(IsIgnore = true)] public List Columns { get; set; } + + //以下 Options扩展字段 + [SqlSugar.SugarColumn(IsIgnore = true)] + public object ParentMenuId { get; set; } + [SqlSugar.SugarColumn(IsIgnore = true)] + public object SortType { get; set; } = "asc"; + [SqlSugar.SugarColumn(IsIgnore = true)] + public object SortField { get; set; } = ""; + #endregion } } diff --git a/ZR.Model/System/Generate/GenTableColumn.cs b/ZR.Model/System/Generate/GenTableColumn.cs index e517540..a19ee39 100644 --- a/ZR.Model/System/Generate/GenTableColumn.cs +++ b/ZR.Model/System/Generate/GenTableColumn.cs @@ -1,53 +1,74 @@ -using Newtonsoft.Json; +using SqlSugar; using System; -using System.Collections.Generic; -using System.Text; +using System.Linq; namespace ZR.Model.System.Generate { /// /// 代码生成表字段 /// - [SqlSugar.SugarTable("gen_table_column")] - public class GenTableColumn: SysBase + [SugarTable("gen_table_column")] + [Tenant("0")] + public class GenTableColumn : SysBase { - [SqlSugar.SugarColumn(IsIdentity = true, IsPrimaryKey = true)] + [SugarColumn(IsIdentity = true, IsPrimaryKey = true)] public int ColumnId { get; set; } + /// + /// 导入代码生成表列名 首字母转了小写 + /// public string ColumnName { get; set; } - [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)] + [SugarColumn(IsOnlyIgnoreUpdate = true)] public int TableId { get; set; } - [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)] + [SugarColumn(IsOnlyIgnoreUpdate = true)] public string TableName { get; set; } + /// + /// 列说明 + /// public string ColumnComment { get; set; } + /// + /// 数据库列类型 + /// - [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)] + [SugarColumn(IsOnlyIgnoreUpdate = true)] public string ColumnType { get; set; } + /// + /// C#类型 + /// public string CsharpType { get; set; } + /// + /// C# 字段名 首字母大写 + /// public string CsharpField { get; set; } /// /// 是否主键（1是） /// - [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)] + [SugarColumn(IsOnlyIgnoreUpdate = true)] public bool IsPk { get; set; } /// /// 是否必填（1是） /// public bool IsRequired { get; set; } - [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)] + /// + /// 是否自增（1是） + /// + [SugarColumn(IsOnlyIgnoreUpdate = true)] public bool IsIncrement { get; set; } /// - /// 是否插入 + /// 是否插入（1是） /// public bool IsInsert { get; set; } /// - /// 是否需要编辑 + /// 是否需要编辑（1是） /// public bool IsEdit { get; set; } /// - /// isList + /// 是否显示列表（1是） /// public bool IsList { get; set; } + /// + /// 是否查询（1是） + /// public bool IsQuery { get; set; } /// /// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件） @@ -61,6 +82,23 @@ namespace ZR.Model.System.Generate /// /// 字典类型 /// - public string DictType { get; set; } + public string DictType { get; set; } = ""; + + #region 额外字段 + [SugarColumn(IsIgnore = true)] + public string RequiredStr + { + get + { + string[] arr = new string[] { "int", "long" }; + return (!IsRequired && (arr.Any(f => f.Contains(CsharpType))) || typeof(DateTime).Name == CsharpType) ? "?" : ""; + } + } + /// + /// 字典集合 + /// + //[SqlSugar.SugarColumn(IsIgnore = true)] + //public List DictDatas { get; set; } + #endregion } } diff --git a/ZR.Model/System/SysBase.cs b/ZR.Model/System/SysBase.cs index d7ea4fe..7cb7a95 100644 --- a/ZR.Model/System/SysBase.cs +++ b/ZR.Model/System/SysBase.cs @@ -4,27 +4,33 @@ using System; using System.Collections.Generic; using System.Text; using SqlSugar; +using OfficeOpenXml.Attributes; namespace ZR.Model.System { + [EpplusTable(PrintHeaders = true, AutofitColumns = true, AutoCalculate = true, ShowTotal = true)] public class SysBase { [SugarColumn(IsOnlyIgnoreUpdate = true)]//设置后修改不会有此字段 [JsonProperty(propertyName: "CreateBy")] + [EpplusIgnore] public string Create_by { get; set; } [SugarColumn(IsOnlyIgnoreUpdate = true)]//设置后修改不会有此字段 [JsonProperty(propertyName: "CreateTime")] + [EpplusTableColumn(NumberFormat = "yyyy-MM-dd HH:mm:ss")] public DateTime Create_time { get; set; } = DateTime.Now; [JsonIgnore] [JsonProperty(propertyName: "UpdateBy")] [SugarColumn(IsOnlyIgnoreInsert = true)] + [EpplusIgnore] public string Update_by { get; set; } //[JsonIgnore] [SugarColumn(IsOnlyIgnoreInsert = true)]//设置后插入数据不会有此字段 [JsonProperty(propertyName: "UpdateTime")] + [EpplusIgnore] public DateTime? Update_time { get; set; } public string Remark { get; set; } @@ -40,6 +46,7 @@ namespace ZR.Model.System /// [SugarColumn(IsIgnore = true)] [JsonIgnore] + [EpplusIgnore] public DateTime? BeginTime { get; set; } /// @@ -47,6 +54,7 @@ namespace ZR.Model.System /// [SugarColumn(IsIgnore = true)] [JsonIgnore] + [EpplusIgnore] public DateTime? EndTime { get; set; } } } diff --git a/ZR.Model/System/SysConfig.cs b/ZR.Model/System/SysConfig.cs index 073feb4..3ecb688 100644 --- a/ZR.Model/System/SysConfig.cs +++ b/ZR.Model/System/SysConfig.cs @@ -1,4 +1,5 @@ -using System; +using SqlSugar; +using System; using System.Collections.Generic; using System.Text; @@ -10,7 +11,8 @@ namespace ZR.Model.System /// @author zhaorui /// @date 2021-09-29 /// - [SqlSugar.SugarTable("sys_config")] + [SugarTable("sys_config")] + [Tenant("0")] public class SysConfig: SysBase { /// diff --git a/ZR.Model/System/SysDept.cs b/ZR.Model/System/SysDept.cs index 95ee177..5f15151 100644 --- a/ZR.Model/System/SysDept.cs +++ b/ZR.Model/System/SysDept.cs @@ -8,7 +8,8 @@ namespace ZR.Model.System /// /// 部门表 /// - [SqlSugar.SugarTable("sys_dept")] + [SugarTable("sys_dept")] + [Tenant("0")] public class SysDept: SysBase { /** 部门ID */ diff --git a/ZR.Model/System/SysDictData.cs b/ZR.Model/System/SysDictData.cs index fe8d30d..bb674fb 100644 --- a/ZR.Model/System/SysDictData.cs +++ b/ZR.Model/System/SysDictData.cs @@ -9,7 +9,7 @@ namespace ZR.Model.System /// /// 字典数据表 /// - //[Table("sys_dict_data")] + [Tenant("0")] [SugarTable("sys_dict_data")] public class SysDictData: SysBase { diff --git a/ZR.Model/System/SysDictType.cs b/ZR.Model/System/SysDictType.cs index f46aad8..4b240b5 100644 --- a/ZR.Model/System/SysDictType.cs +++ b/ZR.Model/System/SysDictType.cs @@ -1,8 +1,5 @@ -//using Dapper.Contrib.Extensions; +using OfficeOpenXml.Attributes; using SqlSugar; -using System; -using System.Collections.Generic; -using System.Text; namespace ZR.Model.System { @@ -10,7 +7,7 @@ namespace ZR.Model.System /// 字典类型表 /// [SugarTable("sys_dict_type")]//当和数据库名称不一样可以设置别名 - //[Table("sys_dict_type")] + [Tenant("0")] public class SysDictType : SysBase { /// @@ -30,6 +27,7 @@ namespace ZR.Model.System /// /// 状态 0、正常 1、停用 /// + [EpplusIgnore] public string Status { get; set; } } } diff --git a/ZR.Model/System/SysFile.cs b/ZR.Model/System/SysFile.cs index 5d17f40..569abb6 100644 --- a/ZR.Model/System/SysFile.cs +++ b/ZR.Model/System/SysFile.cs @@ -1,10 +1,12 @@ -using System; +using SqlSugar; +using System; using System.Collections.Generic; using System.Text; namespace ZR.Model.System { - [SqlSugar.SugarTable("sys_file")] + [Tenant("0")] + [SugarTable("sys_file")] public class SysFile { public int Id { get; set; } diff --git a/ZR.Model/System/SysLogininfor.cs b/ZR.Model/System/SysLogininfor.cs index 4cd080d..958e2f4 100644 --- a/ZR.Model/System/SysLogininfor.cs +++ b/ZR.Model/System/SysLogininfor.cs @@ -1,4 +1,5 @@ //using Dapper.Contrib.Extensions; +using OfficeOpenXml.Attributes; using SqlSugar; using System; @@ -8,6 +9,7 @@ namespace ZR.Model.System /// sys_logininfor 表 /// [SugarTable("sys_logininfor")] + [Tenant("0")] public class SysLogininfor: SysBase { //[Key] @@ -51,6 +53,7 @@ namespace ZR.Model.System /// /// 访问时间 /// + [EpplusTableColumn(NumberFormat = "yyyy-MM-dd HH:mm:ss")] public DateTime loginTime { get; set; } = DateTime.Now; } } diff --git a/ZR.Model/System/SysMenu.cs b/ZR.Model/System/SysMenu.cs index 36f53f7..ca0c3f9 100644 --- a/ZR.Model/System/SysMenu.cs +++ b/ZR.Model/System/SysMenu.cs @@ -1,12 +1,13 @@ -using System.Collections.Generic; +using SqlSugar; +using System.Collections.Generic; namespace ZR.Model.System { /// /// Sys_menu表 /// - //[Table("sys_menu")] - [SqlSugar.SugarTable("sys_menu")] + [SugarTable("sys_menu")] + [Tenant("0")] public class SysMenu: SysBase { /// diff --git a/ZR.Model/System/SysOperLog.cs b/ZR.Model/System/SysOperLog.cs index 93a8830..7e5a690 100644 --- a/ZR.Model/System/SysOperLog.cs +++ b/ZR.Model/System/SysOperLog.cs @@ -1,34 +1,37 @@ using Newtonsoft.Json; +using SqlSugar; using System; using System.Collections.Generic; using System.Text; +using OfficeOpenXml.Attributes; namespace ZR.Model.System { - [SqlSugar.SugarTable("sys_oper_log")] + [SugarTable("sys_oper_log")] + [Tenant("0")] public class SysOperLog { - [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] public long OperId { get; set; } /** 操作模块 */ //@Excel(name = "操作模块") - public String title { get; set; } + public string title { get; set; } /** 业务类型（0其它 1新增 2修改 3删除） */ //@Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") public int businessType { get; set; } /** 业务类型数组 */ - [SqlSugar.SugarColumn(IsIgnore = true)] + [SugarColumn(IsIgnore = true)] public int[] businessTypes { get; set; } /** 请求方法 */ //@Excel(name = "请求方法") - public String method { get; set; } + public string method { get; set; } /** 请求方式 */ //@Excel(name = "请求方式") - public String requestMethod { get; set; } + public string requestMethod { get; set; } /** 操作类别（0其它 1后台用户 2手机端用户） */ //@Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") @@ -36,31 +39,31 @@ namespace ZR.Model.System /** 操作人员 */ //@Excel(name = "操作人员") - public String operName { get; set; } + public string operName { get; set; } /** 部门名称 */ //@Excel(name = "部门名称") - public String deptName { get; set; } + public string deptName { get; set; } /** 请求url */ //@Excel(name = "请求地址") - public String operUrl { get; set; } + public string operUrl { get; set; } /** 操作地址 */ //@Excel(name = "操作地址") - public String operIp { get; set; } + public string operIp { get; set; } /** 操作地点 */ //@Excel(name = "操作地点") - public String operLocation { get; set; } + public string operLocation { get; set; } /** 请求参数 */ //@Excel(name = "请求参数") - public String operParam { get; set; } + public string operParam { get; set; } /** 返回参数 */ //@Excel(name = "返回参数") - public String jsonResult { get; set; } + public string jsonResult { get; set; } /** 操作状态（0正常 1异常） */ //@Excel(name = "状态", readConverterExp = "0=正常,1=异常") @@ -68,13 +71,14 @@ namespace ZR.Model.System /** 错误消息 */ //@Excel(name = "错误消息") - public String errorMsg { get; set; } + public string errorMsg { get; set; } /** 操作时间 */ //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") //@Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") //[DataType] [JsonConverter(typeof(JsonDateConverter))] + [EpplusTableColumn(NumberFormat = "yyyy-MM-dd HH:mm:ss")] public DateTime? operTime { get; set; } /// /// 操作用时 diff --git a/ZR.Model/System/SysPost.cs b/ZR.Model/System/SysPost.cs index 600cc07..766cbc3 100644 --- a/ZR.Model/System/SysPost.cs +++ b/ZR.Model/System/SysPost.cs @@ -1,16 +1,22 @@ -namespace ZR.Model.System +using OfficeOpenXml.Attributes; +using SqlSugar; + +namespace ZR.Model.System { - [SqlSugar.SugarTable("sys_post")] - public class SysPost: SysBase + [SugarTable("sys_post")] + [Tenant("0")] + public class SysPost : SysBase { /// /// 岗位Id /// - [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] public long PostId { get; set; } public string PostCode { get; set; } public string PostName { get; set; } + [EpplusIgnore] public int PostSort { get; set; } + [EpplusIgnore] public string Status { get; set; } } } diff --git a/ZR.Model/System/SysRole.cs b/ZR.Model/System/SysRole.cs index 5026247..6f26887 100644 --- a/ZR.Model/System/SysRole.cs +++ b/ZR.Model/System/SysRole.cs @@ -1,4 +1,5 @@ using Newtonsoft.Json; +using SqlSugar; using System; using System.Collections.Generic; using System.Text; @@ -8,13 +9,14 @@ namespace ZR.Model.System /// /// 角色表 sys_role /// - [SqlSugar.SugarTable("sys_role")] + [SugarTable("sys_role")] + [Tenant("0")] public class SysRole : SysBase { /// /// 角色ID /// - [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] public long RoleId { get; set; } /// @@ -40,18 +42,18 @@ namespace ZR.Model.System /// /// 删除标志（0代表存在 2代表删除） /// - [SqlSugar.SugarColumn(IsOnlyIgnoreInsert = true, IsOnlyIgnoreUpdate = true)] + [SugarColumn(IsOnlyIgnoreInsert = true, IsOnlyIgnoreUpdate = true)] public string DelFlag { get; set; } /// /// 菜单组 /// - [SqlSugar.SugarColumn(IsIgnore = true)] + [SugarColumn(IsIgnore = true)] public long[] MenuIds { get; set; } /// /// 部门组（数据权限） /// - [SqlSugar.SugarColumn(IsIgnore = true)] + [SugarColumn(IsIgnore = true)] public long[] DeptIds { get; set; } public SysRole() { } diff --git a/ZR.Model/System/SysRoleMenu.cs b/ZR.Model/System/SysRoleMenu.cs index 601c2ee..f1d7bef 100644 --- a/ZR.Model/System/SysRoleMenu.cs +++ b/ZR.Model/System/SysRoleMenu.cs @@ -1,4 +1,5 @@ using Newtonsoft.Json; +using SqlSugar; using System; using System.Collections.Generic; using System.Text; @@ -8,14 +9,15 @@ namespace ZR.Model.System /// /// 角色菜单 /// - [SqlSugar.SugarTable("sys_role_menu")] + [SugarTable("sys_role_menu")] + [Tenant("0")] public class SysRoleMenu { [JsonProperty("roleId")] - [SqlSugar.SugarColumn(IsPrimaryKey = true)] + [SugarColumn(IsPrimaryKey = true)] public long Role_id { get; set; } [JsonProperty("menuId")] - [SqlSugar.SugarColumn(IsPrimaryKey = true)] + [SugarColumn(IsPrimaryKey = true)] public long Menu_id { get; set; } public DateTime Create_time { get; set; } public string Create_by { get; set; } diff --git a/ZR.Model/System/SysRolePost.cs b/ZR.Model/System/SysRolePost.cs index 705b139..a9bf406 100644 --- a/ZR.Model/System/SysRolePost.cs +++ b/ZR.Model/System/SysRolePost.cs @@ -9,6 +9,7 @@ namespace ZR.Model.System /// 角色部门 /// [SugarTable("sys_role_post")] + [Tenant("0")] public class SysRolePost { public long RoleId { get; set; } diff --git a/ZR.Model/System/SysTasksLog.cs b/ZR.Model/System/SysTasksLog.cs index e339226..32ab87e 100644 --- a/ZR.Model/System/SysTasksLog.cs +++ b/ZR.Model/System/SysTasksLog.cs @@ -1,4 +1,6 @@ -using System; +using OfficeOpenXml.Attributes; +using SqlSugar; +using System; using System.Collections.Generic; using System.Text; @@ -7,13 +9,14 @@ namespace ZR.Model.System /// /// 任务日志 /// - [SqlSugar.SugarTable("sys_Tasks_log")] + [SugarTable("sys_Tasks_log")] + [Tenant("0")] public class SysTasksLog { /// /// 日志Id /// - [SqlSugar.SugarColumn(IsIdentity = true, IsPrimaryKey = true)] + [SugarColumn(IsIdentity = true, IsPrimaryKey = true)] public long JobLogId { get; set; } /// /// 任务Id @@ -37,6 +40,8 @@ namespace ZR.Model.System /// 调用目标字符串 /// public string InvokeTarget { get; set; } + + [EpplusTableColumn(NumberFormat = "yyyy-MM-dd HH:mm:ss")] public DateTime CreateTime { get; set; } /// /// 执行用时，毫秒 diff --git a/ZR.Model/System/SysTasksQz.cs b/ZR.Model/System/SysTasksQz.cs index ac02bf8..26988b6 100644 --- a/ZR.Model/System/SysTasksQz.cs +++ b/ZR.Model/System/SysTasksQz.cs @@ -11,6 +11,7 @@ namespace ZR.Model.System ///计划任务 /// [SugarTable("Sys_TasksQz")] + [Tenant("0")] public class SysTasksQz { public SysTasksQz() diff --git a/ZR.Model/System/SysUser.cs b/ZR.Model/System/SysUser.cs index f4390bf..7a19ae6 100644 --- a/ZR.Model/System/SysUser.cs +++ b/ZR.Model/System/SysUser.cs @@ -1,4 +1,5 @@ using Newtonsoft.Json; +using OfficeOpenXml.Attributes; using SqlSugar; using System; using System.Collections.Generic; @@ -10,6 +11,7 @@ namespace ZR.Model.System /// 用户表 /// [SugarTable("sys_user")] + [Tenant("0")] public class SysUser : SysBase { /// @@ -28,12 +30,13 @@ namespace ZR.Model.System //[JsonProperty(propertyName: "userType")] //public string User_type { get; set; } = ""; [SugarColumn(IsOnlyIgnoreInsert = true)] + [EpplusIgnore] public string Avatar { get; set; } public string Email { get; set; } [JsonIgnore] - //[ColName("用户密码")] + [EpplusIgnore] public string Password { get; set; } //[ColName("手机号")] @@ -47,6 +50,7 @@ namespace ZR.Model.System /// /// 帐号状态（0正常 1停用） /// + [EpplusIgnore] public string Status { get; set; } /// @@ -65,6 +69,7 @@ namespace ZR.Model.System /// 最后登录时间 /// [SugarColumn(IsOnlyIgnoreInsert = true)] + [EpplusTableColumn(NumberFormat = "yyyy-MM-dd HH:mm:ss")] public DateTime LoginDate { get; set; } /// @@ -93,14 +98,17 @@ namespace ZR.Model.System /// 角色id集合 /// [SugarColumn(IsIgnore = true)] + [EpplusIgnore] public int[] RoleIds { get; set; } /// /// 岗位集合 /// [SugarColumn(IsIgnore = true)] + [EpplusIgnore] public int[] PostIds { get; set; } [SugarColumn(IsIgnore = true)] + [EpplusIgnore] public List Roles { get; set; } #endregion diff --git a/ZR.Model/System/SysUserPost.cs b/ZR.Model/System/SysUserPost.cs index 7804cca..67847dd 100644 --- a/ZR.Model/System/SysUserPost.cs +++ b/ZR.Model/System/SysUserPost.cs @@ -10,6 +10,7 @@ namespace ZR.Model.System /// 用户岗位 /// [SugarTable("sys_user_post")] + [Tenant("0")] public class SysUserPost { public long UserId { get; set; } diff --git a/ZR.Model/System/SysUserRole.cs b/ZR.Model/System/SysUserRole.cs index 1495195..78f6334 100644 --- a/ZR.Model/System/SysUserRole.cs +++ b/ZR.Model/System/SysUserRole.cs @@ -1,4 +1,5 @@ -using System; +using SqlSugar; +using System; using System.Collections.Generic; using System.Text; @@ -8,6 +9,7 @@ namespace ZR.Model.System /// 用户角色关联表 用户N-1 角色 /// [SqlSugar.SugarTable("sys_user_role")] + [Tenant("0")] public class SysUserRole { [SqlSugar.SugarColumn(ColumnName = "user_id", IsPrimaryKey = true)] diff --git a/ZR.Model/Vo/VMPageResult.cs b/ZR.Model/Vo/VMPageResult.cs deleted file mode 100644 index a6af85b..0000000 --- a/ZR.Model/Vo/VMPageResult.cs +++ /dev/null @@ -1,53 +0,0 @@ -using Newtonsoft.Json; -using System.Collections.Generic; -using System.Data; - -namespace ZR.Model.Vo -{ - public class VMPageResult where T : new() - { - public int Page { get; set; } - public int PageSize { get; set; } - public long TotalNum { get; set; } - //public int TotalPages { get; set; } - public IList Result { get; set; } - public long EndPage { get; set; } - [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] - public DataTable Data { get; set; } - - public VMPageResult() - { - } - - /// - /// 集合使用 - /// - /// - /// - public VMPageResult(IList result, PagerInfo pagerInfo) - { - this.Result = result; - this.TotalNum = pagerInfo.TotalNum; - this.PageSize = pagerInfo.PageSize; - this.Page = pagerInfo.PageNum; - //计算 - this.EndPage = pagerInfo.TotalNum % PageSize == 0 ? pagerInfo.TotalNum / PageSize : pagerInfo.TotalNum / PageSize + 1; - } - - /// - /// datable使用 - /// - /// - /// - public VMPageResult(DataTable result, PagerInfo pagerInfo) - { - this.Data = result; - this.TotalNum = pagerInfo.TotalNum; - this.PageSize = pagerInfo.PageSize; - this.Page = pagerInfo.PageNum; - //计算 - this.EndPage = pagerInfo.TotalNum % PageSize == 0 ? pagerInfo.TotalNum / PageSize : pagerInfo.TotalNum / PageSize + 1; - } - } - -} diff --git a/ZR.Model/ZR.Model.csproj b/ZR.Model/ZR.Model.csproj index 9d0f89b..038843a 100644 --- a/ZR.Model/ZR.Model.csproj +++ b/ZR.Model/ZR.Model.csproj @@ -5,11 +5,7 @@ - - - - - + @@ -18,6 +14,7 @@ + diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs index 3324044..71dc86a 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/ZR.Repository/BaseRepository.cs @@ -4,7 +4,9 @@ using SqlSugar.IOC; using System; using System.Collections.Generic; using System.Data; +using System.Linq; using System.Linq.Expressions; +using System.Reflection; using ZR.Model; namespace ZR.Repository @@ -16,54 +18,37 @@ namespace ZR.Repository public class BaseRepository : IBaseRepository where T : class, new() { public ISqlSugarClient Context; - public BaseRepository(string configId = "0") + + public BaseRepository(ISqlSugarClient client = null) { - Context = DbScoped.SugarScope.GetConnection(configId);//根据类传入的ConfigId自动选择 + var configId = typeof(T).GetCustomAttribute()?.configId; + if(configId != null) + { + Context = DbScoped.SugarScope.GetConnection(configId); + } + else + { + Context = client ?? DbScoped.SugarScope.GetConnection(1);//根据类传入的ConfigId自动选择 + } } #region add - /// - /// 插入指定列使用 - /// - /// - /// - /// - /// - public int Add(T parm, Expression> iClumns = null, bool ignoreNull = true) - { - return Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand(); - } + /// /// 插入实体 /// /// - /// 默认忽略null列 /// public int Add(T t) { - return Context.Insertable(t).ExecuteCommand(); + return Context.Insertable(t).IgnoreColumns(true).ExecuteCommand(); } - //public int InsertIgnoreNullColumn(T t) - //{ - // return Context.Insertable(t).IgnoreColumns(true).ExecuteCommand(); - //} - - //public int InsertIgnoreNullColumn(T t, params string[] columns) - //{ - // return Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand(); - //} - //public int Insert(SqlSugarClient client, T t) //{ // return client.Insertable(t).ExecuteCommand(); //} - //public long InsertBigIdentity(T t) - //{ - // return base.Context.Insertable(t).ExecuteReturnBigIdentity(); - //} - public int Insert(List t) { return Context.Insertable(t).ExecuteCommand(); @@ -82,10 +67,10 @@ namespace ZR.Repository //{ // return base.Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand(); //} - //public int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true) - //{ - // return base.Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand(); - //} + public int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true) + { + return Context.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand(); + } //public DbResult InsertTran(T t) //{ // var result = base.Context.Ado.UseTran(() => @@ -128,35 +113,33 @@ namespace ZR.Repository //{ // return base.Context.Ado.ExecuteCommand(sql, parameters) > 0; //} - + public IInsertable Insertable(T t) + { + return Context.Insertable(t); + } #endregion add #region update - //public bool UpdateEntity(T entity, bool ignoreNullColumns = false) - //{ - // return base.Context.Updateable(entity).IgnoreColumns(ignoreNullColumns).ExecuteCommand() > 0; - //} + public bool Update(T entity, bool ignoreNullColumns = false) + { + return Context.Updateable(entity).IgnoreColumns(ignoreNullColumns).ExecuteCommand() > 0; + } - //public bool Update(T entity, Expression> expression) - //{ - // return base.Context.Updateable(entity).Where(expression).ExecuteCommand() > 0; - //} + public bool Update(T entity, Expression> expression, bool ignoreAllNull = false) + { + return Context.Updateable(entity).UpdateColumns(expression).IgnoreColumns(ignoreAllNull).ExecuteCommand() > 0; + } - //public bool Update(T entity, Expression> expression, bool ignoreAllNull = false) - //{ - // return base.Context.Updateable(entity).UpdateColumns(expression).IgnoreColumns(ignoreAllNull).ExecuteCommand() > 0; - //} + public bool Update(T entity, Expression> expression, Expression> where) + { + return Context.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0; + } - //public bool Update(T entity, Expression> expression, Expression> where) - //{ - // return base.Context.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0; - //} - - //public bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where) - //{ - // return client.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0; - //} + public bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where) + { + return client.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0; + } /// /// @@ -175,7 +158,6 @@ namespace ZR.Repository "Create_time" }; } - //base.Context.Updateable(entity).IgnoreColumns(c => list.Contains(c)).Where(isNull).ExecuteCommand() return Context.Updateable(entity).IgnoreColumns(isNull).IgnoreColumns(list.ToArray()).ExecuteCommand() > 0; } @@ -281,40 +263,40 @@ namespace ZR.Repository // return Context.Queryable(tableName).ToList(); //} - //public (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10) - //{ - // int totalNumber = 0; - // var list = Context.Queryable().Where(expression).ToPageList(pageIndex, pageSize, ref totalNumber); - // return (list, totalNumber); - //} + public (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10) + { + int totalNumber = 0; + var list = Context.Queryable().Where(expression).ToPageList(pageIndex, pageSize, ref totalNumber); + return (list, totalNumber); + } - //public (List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10) - //{ - // int totalNumber = 0; - // var list = Context.Queryable().Where(expression).OrderBy(order).ToPageList(pageIndex, pageSize, ref totalNumber); - // return (list, totalNumber); - //} + public (List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10) + { + int totalNumber = 0; + var list = Context.Queryable().Where(expression).OrderBy(order).ToPageList(pageIndex, pageSize, ref totalNumber); + return (list, totalNumber); + } - //public (List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10) - //{ - // int totalNumber = 0; + public (List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10) + { + int totalNumber = 0; - // if (orderBy.Equals("DESC", StringComparison.OrdinalIgnoreCase)) - // { - // var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Desc).ToPageList(pageIndex, pageSize, ref totalNumber); - // return (list, totalNumber); - // } - // else - // { - // var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Asc).ToPageList(pageIndex, pageSize, ref totalNumber); - // return (list, totalNumber); - // } - //} + if (orderBy.Equals("DESC", StringComparison.OrdinalIgnoreCase)) + { + var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Desc).ToPageList(pageIndex, pageSize, ref totalNumber); + return (list, totalNumber); + } + else + { + var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Asc).ToPageList(pageIndex, pageSize, ref totalNumber); + return (list, totalNumber); + } + } - //public List SqlQueryToList(string sql, object obj = null) - //{ - // return Context.Ado.SqlQuery(sql, obj); - //} + public List SqlQueryToList(string sql, object obj = null) + { + return Context.Ado.SqlQuery(sql, obj); + } /// /// 获得一条数据 /// @@ -347,9 +329,9 @@ namespace ZR.Repository return source.ToPage(parm); } - public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderEnum = "Asc") + public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, OrderByType orderEnum = OrderByType.Asc) { - var source = Context.Queryable().Where(where).OrderByIF(orderEnum == "Asc", order, OrderByType.Asc).OrderByIF(orderEnum == "Desc", order, OrderByType.Desc); + var source = Context.Queryable().Where(where).OrderByIF(orderEnum == OrderByType.Asc, order, OrderByType.Asc).OrderByIF(orderEnum == OrderByType.Desc, order, OrderByType.Desc); return source.ToPage(parm); } @@ -395,11 +377,6 @@ namespace ZR.Repository var result = (Context.Ado.UseStoredProcedure().GetDataTable(procedureName, parameters), parameters); return result; } - - //public string QueryableToJson(string select, Expression> expressionWhere) - //{ - // throw new NotImplementedException(); - //} } public static class QueryableExtension @@ -414,13 +391,13 @@ namespace ZR.Repository public static PagedInfo ToPage(this ISugarQueryable source, PagerInfo parm) { var page = new PagedInfo(); - var total = source.Count(); - page.TotalCount = total; + var total = 0; page.PageSize = parm.PageSize; page.PageIndex = parm.PageNum; - //page.DataSource = source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.OrderBy} {(parm.Sort == "descending" ? "desc" : "asc")}").ToPageList(parm.PageNum, parm.PageSize); - page.Result = source.ToPageList(parm.PageNum, parm.PageSize); + page.Result = source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.OrderBy} {(parm.Sort == "desc" ? "desc" : "asc")}") + .ToPageList(parm.PageNum, parm.PageSize, ref total); + page.TotalNum = total; return page; } diff --git a/ZR.Repository/IBaseRepository.cs b/ZR.Repository/IBaseRepository.cs index 0bfe14f..90ca56e 100644 --- a/ZR.Repository/IBaseRepository.cs +++ b/ZR.Repository/IBaseRepository.cs @@ -15,19 +15,12 @@ namespace ZR.Repository public interface IBaseRepository where T : class, new() { #region add - int Add(T parm, Expression> iClumns = null, bool ignoreNull = true); int Add(T t); - //int InsertIgnoreNullColumn(T t); - - //int InsertIgnoreNullColumn(T t, params string[] columns); - //int Insert(SqlSugarClient client, T t); - //long InsertBigIdentity(T t); - int Insert(List t); - //int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true); + int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true); //int InsertIgnoreNullColumn(List t); @@ -46,14 +39,12 @@ namespace ZR.Repository //bool ExecuteCommand(string sql, params SugarParameter[] parameters); //bool ExecuteCommand(string sql, List parameters); - + IInsertable Insertable(T t); #endregion add #region update - //bool UpdateEntity(T entity, bool ignoreNullColumns = false); - - //bool Update(T entity, Expression> expression); + bool Update(T entity, bool ignoreNullColumns = false); /// /// 只更新表达式的值 @@ -61,22 +52,12 @@ namespace ZR.Repository /// /// /// - //bool Update(T entity, Expression> expression, bool ignoreAllNull = false); + bool Update(T entity, Expression> expression, bool ignoreAllNull = false); - //bool Update(T entity, Expression> expression, Expression> where); + bool Update(T entity, Expression> expression, Expression> where); - //bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where); + bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where); - /// - /// - /// - /// T - /// 忽略更新 - /// Null不更新 - /// - bool Update(T entity, List list = null, bool isNull = true); - - //bool Update(List entity); bool Update(Expression> where, Expression> columns); #endregion update @@ -105,7 +86,7 @@ namespace ZR.Repository /// PagedInfo GetPages(Expression> where, PagerInfo parm); - PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderEnum = "Asc"); + PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, OrderByType orderEnum = OrderByType.Asc); bool Any(Expression> expression); @@ -124,15 +105,13 @@ namespace ZR.Repository //List QueryableToList(string tableName); - //(List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10); + (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10); - //(List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10); + (List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10); - //(List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10); + (List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10); - //(List, int) QueryableToPage(Expression> expression, Bootstrap.BootstrapParams bootstrap); - - //List SqlQueryToList(string sql, object obj = null); + List SqlQueryToList(string sql, object obj = null); /// /// 获得一条数据 /// diff --git a/ZR.Repository/Repositories/GendemoRepository.cs b/ZR.Repository/Repositories/GendemoRepository.cs deleted file mode 100644 index e830a4c..0000000 --- a/ZR.Repository/Repositories/GendemoRepository.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using Infrastructure.Attribute; -using ZR.Repository.System; -using ZR.Model.Models; - -namespace ZR.Repository -{ - /// - /// 代码生成演示仓储接口的实现 - /// - /// @author zr - /// @date 2021-11-24 - /// - [AppService(ServiceLifetime = LifeTime.Transient)] - public class GendemoRepository : BaseRepository - { - #region 业务逻辑代码 - #endregion - } -} \ No newline at end of file diff --git a/ZR.Repository/System/ArticleRepository.cs b/ZR.Repository/System/ArticleRepository.cs index 57001a7..718735e 100644 --- a/ZR.Repository/System/ArticleRepository.cs +++ b/ZR.Repository/System/ArticleRepository.cs @@ -13,8 +13,17 @@ namespace ZR.Repository.System /// 文章管理 /// [AppService(ServiceLifetime = LifeTime.Transient)] - public class ArticleRepository + public class ArticleRepository : BaseRepository
{ } + + /// + /// 文章目录 + /// + [AppService(ServiceLifetime = LifeTime.Transient)] + public class ArticleCategoryRepository : BaseRepository + { + + } } diff --git a/ZR.Repository/System/GenTableRepository.cs b/ZR.Repository/System/GenTableRepository.cs index 0ce1970..e5839fe 100644 --- a/ZR.Repository/System/GenTableRepository.cs +++ b/ZR.Repository/System/GenTableRepository.cs @@ -1,4 +1,5 @@ using Infrastructure.Attribute; +using SqlSugar; using System; using System.Collections.Generic; using System.Linq; diff --git a/ZR.Repository/System/SysConfigRepository.cs b/ZR.Repository/System/SysConfigRepository.cs index 4f391e0..63ae19b 100644 --- a/ZR.Repository/System/SysConfigRepository.cs +++ b/ZR.Repository/System/SysConfigRepository.cs @@ -1,7 +1,5 @@ using System; using Infrastructure.Attribute; -using ZR.Repository.System; -using ZR.Model.Models; using ZR.Model.System; namespace ZR.Repository diff --git a/ZR.Repository/System/SysDictDataRepository.cs b/ZR.Repository/System/SysDictDataRepository.cs index f5b205f..9012ec5 100644 --- a/ZR.Repository/System/SysDictDataRepository.cs +++ b/ZR.Repository/System/SysDictDataRepository.cs @@ -1,6 +1,9 @@ using Infrastructure.Attribute; +using Infrastructure.Model; +using SqlSugar; using System; using System.Collections.Generic; +using ZR.Model; using ZR.Model.System; namespace ZR.Repository.System @@ -15,14 +18,15 @@ namespace ZR.Repository.System /// 字典类型数据搜索 ///
/// + /// /// - public List SelectDictDataList(SysDictData dictData) + public PagedInfo SelectDictDataList(SysDictData dictData, PagerInfo pagerInfo) { - return Context.Queryable() - .WhereIF(!string.IsNullOrEmpty(dictData.DictLabel), it => it.DictLabel.Contains(dictData.DictLabel)) - .WhereIF(!string.IsNullOrEmpty(dictData.Status), it => it.Status == dictData.Status) - .WhereIF(!string.IsNullOrEmpty(dictData.DictType), it => it.DictType == dictData.DictType) - .ToList(); + var exp = Expressionable.Create(); + exp.AndIF(!string.IsNullOrEmpty(dictData.DictLabel), it => it.DictLabel.Contains(dictData.DictLabel)); + exp.AndIF(!string.IsNullOrEmpty(dictData.Status), it => it.Status == dictData.Status); + exp.AndIF(!string.IsNullOrEmpty(dictData.DictType), it => it.DictType == dictData.DictType); + return GetPages(exp.ToExpression(), pagerInfo); } /// diff --git a/ZR.Repository/System/SysDictRepository.cs b/ZR.Repository/System/SysDictRepository.cs index 648db57..3fc177b 100644 --- a/ZR.Repository/System/SysDictRepository.cs +++ b/ZR.Repository/System/SysDictRepository.cs @@ -1,7 +1,7 @@ using Infrastructure.Attribute; -using System; +using SqlSugar; using System.Collections.Generic; -using System.Text; +using ZR.Model; using ZR.Model.System; namespace ZR.Repository.System @@ -22,17 +22,14 @@ namespace ZR.Repository.System /// /// 实体模型 /// - public List SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager) + public PagedInfo SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager) { - var totalNum = 0; - var list = Context - .Queryable() - .WhereIF(!string.IsNullOrEmpty(dictType.DictName), it => it.DictName.Contains(dictType.DictName)) - .WhereIF(!string.IsNullOrEmpty(dictType.Status), it => it.Status == dictType.Status) - .WhereIF(!string.IsNullOrEmpty(dictType.DictType), it => it.DictType == dictType.DictType) - .ToPageList(pager.PageNum, pager.PageSize, ref totalNum); - pager.TotalNum = totalNum; - return list; + var exp = Expressionable.Create(); + exp.AndIF(!string.IsNullOrEmpty(dictType.DictName), it => it.DictName.Contains(dictType.DictName)); + exp.AndIF(!string.IsNullOrEmpty(dictType.Status), it => it.Status == dictType.Status); + exp.AndIF(!string.IsNullOrEmpty(dictType.DictType), it => it.DictType == dictType.DictType); + + return GetPages(exp.ToExpression(), pager); } /// diff --git a/ZR.Repository/System/SysOperLogRepository.cs b/ZR.Repository/System/SysOperLogRepository.cs index 7953394..3050170 100644 --- a/ZR.Repository/System/SysOperLogRepository.cs +++ b/ZR.Repository/System/SysOperLogRepository.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using ZR.Model; using ZR.Model.System.Dto; using ZR.Model.System; +using SqlSugar; +using Infrastructure.Model; namespace ZR.Repository.System { @@ -16,19 +18,16 @@ namespace ZR.Repository.System /// /// 分页数据 /// - public List GetSysOperLog(SysOperLogDto sysOper, PagerInfo pagerInfo) + public PagedInfo GetSysOperLog(SysOperLogDto sysOper, PagerInfo pagerInfo) { - int totalCount = 0; - var list = Context.Queryable() - .Where(it => it.operTime >= sysOper.BeginTime && it.operTime <= sysOper.EndTime) - .WhereIF(sysOper.Title.IfNotEmpty(), it => it.title.Contains(sysOper.Title)) - .WhereIF(sysOper.operName.IfNotEmpty(), it => it.operName.Contains(sysOper.operName)) - .WhereIF(sysOper.BusinessType != -1, it =>it.businessType == sysOper.BusinessType) - .WhereIF(sysOper.Status != -1, it => it.status == sysOper.Status) - .OrderBy(it => it.OperId, SqlSugar.OrderByType.Desc) - .ToPageList(pagerInfo.PageNum, pagerInfo.PageSize, ref totalCount); - pagerInfo.TotalNum = totalCount; - return list; + var exp = Expressionable.Create(); + exp.And(it => it.operTime >= sysOper.BeginTime && it.operTime <= sysOper.EndTime); + exp.AndIF(sysOper.Title.IfNotEmpty(), it => it.title.Contains(sysOper.Title)); + exp.AndIF(sysOper.operName.IfNotEmpty(), it => it.operName.Contains(sysOper.operName)); + exp.AndIF(sysOper.BusinessType != -1, it => it.businessType == sysOper.BusinessType); + exp.AndIF(sysOper.Status != -1, it => it.status == sysOper.Status); + + return GetPages(exp.ToExpression(), pagerInfo, x => x.OperId, OrderByType.Desc); } /// diff --git a/ZR.Repository/System/SysRoleRepository.cs b/ZR.Repository/System/SysRoleRepository.cs index 0b90901..7afb00c 100644 --- a/ZR.Repository/System/SysRoleRepository.cs +++ b/ZR.Repository/System/SysRoleRepository.cs @@ -33,13 +33,13 @@ namespace ZR.Repository.System /// public PagedInfo SelectRoleList(SysRole sysRole, PagerInfo pager) { - return Context.Queryable() - .Where(role => role.DelFlag == "0") - .WhereIF(!string.IsNullOrEmpty(sysRole.RoleName), role => role.RoleName.Contains(sysRole.RoleName)) - .WhereIF(!string.IsNullOrEmpty(sysRole.Status), role => role.Status == sysRole.Status) - .WhereIF(!string.IsNullOrEmpty(sysRole.RoleKey), role => role.RoleKey == sysRole.RoleKey) - .OrderBy(role => role.RoleSort) - .ToPage(pager); + var exp = Expressionable.Create(); + exp.And(role => role.DelFlag == "0"); + exp.AndIF(!string.IsNullOrEmpty(sysRole.RoleName), role => role.RoleName.Contains(sysRole.RoleName)); + exp.AndIF(!string.IsNullOrEmpty(sysRole.Status), role => role.Status == sysRole.Status); + exp.AndIF(!string.IsNullOrEmpty(sysRole.RoleKey), role => role.RoleKey == sysRole.RoleKey); + + return GetPages(exp.ToExpression(), pager, x => x.RoleSort); } /// diff --git a/ZR.Repository/System/SysTasksQzRepository.cs b/ZR.Repository/System/SysTasksQzRepository.cs new file mode 100644 index 0000000..a231073 --- /dev/null +++ b/ZR.Repository/System/SysTasksQzRepository.cs @@ -0,0 +1,15 @@ +using Infrastructure.Attribute; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ZR.Model.System; + +namespace ZR.Repository.System +{ + [AppService(ServiceLifetime = LifeTime.Transient)] + public class SysTasksQzRepository: BaseRepository + { + } +} diff --git a/ZR.Service/BaseService.cs b/ZR.Service/BaseService.cs index 9f79143..0b68a66 100644 --- a/ZR.Service/BaseService.cs +++ b/ZR.Service/BaseService.cs @@ -1,4 +1,12 @@ -using ZR.Repository; +using Infrastructure.Model; +using SqlSugar; +using SqlSugar.IOC; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq.Expressions; +using ZR.Model; +using ZR.Repository; namespace ZR.Service { @@ -6,284 +14,371 @@ namespace ZR.Service /// 基础服务定义 /// /// - public class BaseService : BaseRepository, IBaseService where T : class, new() + public class BaseService : IBaseService where T : class, new() { - //#region 添加操作 - ///// - ///// 添加一条数据 - ///// - ///// T - ///// - //public int Add(T parm) + public IBaseRepository baseRepository; + + public BaseService(IBaseRepository repository) + { + this.baseRepository = repository ?? throw new ArgumentNullException(nameof(repository)); + } + #region add + /// + /// 插入指定列使用 + /// + /// + /// + /// + /// + public int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true) + { + return baseRepository.Insert(parm, iClumns, ignoreNull); + } + /// + /// 插入实体 + /// + /// + /// + public int Add(T t) + { + return baseRepository.Add(t); + } + public IInsertable Insertable(T t) + { + return baseRepository.Insertable(t); + } + //public int Insert(SqlSugarClient client, T t) //{ - // return Add(parm);// Context.Insertable(parm).RemoveDataCache().ExecuteCommand(); + // return client.Insertable(t).ExecuteCommand(); //} - ///// - ///// 添加 - ///// - ///// - ///// 插入列 - ///// 忽略null列 - ///// - //public int Add(T parm, Expression> iClumns = null, bool ignoreNull = true) + //public long InsertBigIdentity(T t) //{ - // return Add(parm); + // return base.Context.Insertable(t).ExecuteReturnBigIdentity(); //} - ///// - ///// 批量添加数据 - ///// - ///// List - ///// - //public int Add(List parm) + public int Insert(List t) + { + return baseRepository.Insert(t); + } + public long InsertReturnBigIdentity(T t) + { + return baseRepository.InsertReturnBigIdentity(t); + } + + //public int InsertIgnoreNullColumn(List t) //{ - // return 1;// Context.Insertable(parm).RemoveDataCache().ExecuteCommand(); + // return base.Context.Insertable(t).IgnoreColumns(true).ExecuteCommand(); //} - ///// - ///// 添加或更新数据，不推荐使用了 - ///// - ///// List - ///// - //public T Saveable(T parm, Expression> uClumns = null, Expression> iColumns = null) + //public int InsertIgnoreNullColumn(List t, params string[] columns) //{ - // var command = Context.Saveable(parm); - - // if (uClumns != null) + // return base.Context.Insertable(t).IgnoreColumns(columns).ExecuteCommand(); + //} + //public DbResult InsertTran(T t) + //{ + // var result = base.Context.Ado.UseTran(() => // { - // command = command.UpdateIgnoreColumns(uClumns); - // } + // base.Context.Insertable(t).ExecuteCommand(); + // }); + // return result; + //} - // if (iColumns != null) + //public DbResult InsertTran(List t) + //{ + // var result = base.Context.Ado.UseTran(() => // { - // command = command.InsertIgnoreColumns(iColumns); - // } - - // return command.ExecuteReturnEntity(); + // base.Context.Insertable(t).ExecuteCommand(); + // }); + // return result; //} - ///// - ///// 批量添加或更新数据 - ///// - ///// List - ///// - //public List Saveable(List parm, Expression> uClumns = null, Expression> iColumns = null) + //public T InsertReturnEntity(T t) //{ - // var command = Context.Saveable(parm); + // return base.Context.Insertable(t).ExecuteReturnEntity(); + //} - // if (uClumns != null) + //public T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock) + //{ + // return base.Context.Insertable(t).With(sqlWith).ExecuteReturnEntity(); + //} + + //public bool ExecuteCommand(string sql, object parameters) + //{ + // return base.Context.Ado.ExecuteCommand(sql, parameters) > 0; + //} + + //public bool ExecuteCommand(string sql, params SugarParameter[] parameters) + //{ + // return base.Context.Ado.ExecuteCommand(sql, parameters) > 0; + //} + + //public bool ExecuteCommand(string sql, List parameters) + //{ + // return base.Context.Ado.ExecuteCommand(sql, parameters) > 0; + //} + + #endregion add + + #region update + + public bool Update(T entity, bool ignoreNullColumns = false) + { + return baseRepository.Update(entity, ignoreNullColumns); + } + + public bool Update(T entity, Expression> expression, bool ignoreAllNull = false) + { + return baseRepository.Update(entity, expression, ignoreAllNull); + } + + public bool Update(T entity, Expression> expression, Expression> where) + { + return baseRepository.Update(entity, expression, where); + } + + public bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where) + { + return client.Updateable(entity).UpdateColumns(expression).Where(where).ExecuteCommand() > 0; + } + + ///// + ///// + ///// + ///// + ///// + ///// 默认为true + ///// + //public bool Update(T entity, List list = null, bool isNull = true) + //{ + // if (list == null) // { - // command = command.UpdateIgnoreColumns(uClumns); - // } - - // if (iColumns != null) + // list = new List() // { - // command = command.InsertIgnoreColumns(iColumns); + // "Create_By", + // "Create_time" + // }; // } - - // return command.ExecuteReturnList(); + // //base.Context.Updateable(entity).IgnoreColumns(c => list.Contains(c)).Where(isNull).ExecuteCommand() + // return baseRepository.Update(entity, list, isNull); //} - //#endregion - //#region 查询操作 - - ///// - ///// 根据条件查询数据是否存在 - ///// - ///// 条件表达式树 - ///// - //public bool Any(Expression> where) + //public bool Update(List entity) //{ - // return true;// base.Context.Any(where); + // var result = base.Context.Ado.UseTran(() => + // { + // base.Context.Updateable(entity).ExecuteCommand(); + // }); + // return result.IsSuccess; //} + public bool Update(Expression> where, Expression> columns) + { + return baseRepository.Update(where, columns); + } + #endregion update - ///// - ///// 根据条件合计字段 - ///// - ///// 条件表达式树 - ///// - //public TResult Sum(Expression> where, Expression> field) - //{ - // return base.Context.Queryable().Where(where).Sum(field); - //} + public DbResult UseTran(Action action) + { + var result = baseRepository.UseTran(action); + return result; + } - ///// - ///// 根据主值查询单条数据 - ///// - ///// 主键值 - ///// 泛型实体 - ////public T GetId(object pkValue) - ////{ - //// return base.Context.Queryable().InSingle(pkValue); - ////} + public DbResult UseTran(SqlSugarClient client, Action action) + { + var result = client.Ado.UseTran(() => action()); + return result; + } - ///// - ///// 根据主键查询多条数据 - ///// - ///// - ///// - //public List GetIn(object[] ids) - //{ - // return Context.Queryable().In(ids).ToList(); - //} + public bool UseTran2(Action action) + { + var result = baseRepository.UseTran2(action); + return result; + } - ///// - ///// 根据条件取条数 - ///// - ///// 条件表达式树 - ///// - //public int GetCount(Expression> where) - //{ - // return Context.Queryable().Count(where); - - //} - - ///// - ///// 查询所有数据(无分页,请慎用) - ///// - ///// - //public List GetAll(bool useCache = false, int cacheSecond = 3600) - //{ - // return Context.Queryable().WithCacheIF(useCache, cacheSecond).ToList(); - //} - - ///// - ///// 获得一条数据 - ///// - ///// Expression> - ///// - //public T GetFirst2(Expression> where) - //{ - // return base.GetFirst(where);// Context.Queryable().Where(where).First(); - //} - - ///// - ///// 获得一条数据 - ///// - ///// string - ///// - ////public T GetFirst(string parm) - ////{ - //// return Context.Queryable().Where(parm).First(); - ////} - - ///// - ///// 根据条件查询分页数据 - ///// - ///// - ///// - ///// - //public PagedInfo GetPages(Expression> where, PagerInfo parm) - //{ - // var source = Context.Queryable().Where(where); - - // return source.ToPage(parm); - //} - - //public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderEnum = "Asc") - //{ - // var source = Context.Queryable().Where(where).OrderByIF(orderEnum == "Asc", order, OrderByType.Asc).OrderByIF(orderEnum == "Desc", order, OrderByType.Desc); - - // return source.ToPage(parm); - //} + #region delete /// - /// 根据条件查询数据 + /// 删除表达式 /// - /// 条件表达式树 + /// /// - // public List GetWhere(Expression> where, bool useCache = false, int cacheSecond = 3600) - // { - // var query = Context.Queryable().Where(where).WithCacheIF(useCache, cacheSecond); - // return query.ToList(); - // } + public int Delete(Expression> expression) + { + return baseRepository.Delete(expression); + } - // /// - ///// 根据条件查询数据 - ///// - ///// 条件表达式树 - ///// - // public List GetWhere(Expression> where, Expression> order, string orderEnum = "Asc", bool useCache = false, int cacheSecond = 3600) - // { - // var query = Context.Queryable().Where(where).OrderByIF(orderEnum == "Asc", order, OrderByType.Asc).OrderByIF(orderEnum == "Desc", order, OrderByType.Desc).WithCacheIF(useCache, cacheSecond); - // return query.ToList(); - // } + /// + /// 批量删除 + /// + /// + /// + public int Delete(object[] obj) + { + return baseRepository.Delete(obj); + } + public int Delete(object id) + { + return baseRepository.Delete(id); + } + public bool DeleteTable() + { + return baseRepository.DeleteTable(); + } - // #endregion + #endregion delete - //#region 修改操作 + #region query - /////// - /////// 修改一条数据 - /////// - /////// T - /////// - ////public int Update(T parm) - ////{ - //// return Context.Updateable(parm).RemoveDataCache().ExecuteCommand(); - ////} + public bool Any(Expression> expression) + { + return baseRepository.Any(expression); + } - /////// - /////// 批量修改 - /////// - /////// T - /////// - ////public int Update(List parm) - ////{ - //// return Context.Updateable(parm).RemoveDataCache().ExecuteCommand(); - ////} + public ISugarQueryable Queryable() + { + return baseRepository.Queryable(); + } - /////// - /////// 按查询条件更新 - /////// - /////// - /////// - /////// - ////public int Update(Expression> where, Expression> columns) - ////{ - //// return Context.Updateable().SetColumns(columns).Where(where).RemoveDataCache().ExecuteCommand(); - ////} + public List GetList(Expression> expression) + { + return baseRepository.GetList(expression); + } - //#endregion - - //#region 删除操作 - - /////// - /////// 删除一条或多条数据 - /////// - /////// string - /////// - ////public int Delete(object id) - ////{ - //// return Context.Deleteable(id).RemoveDataCache().ExecuteCommand(); - ////} - - /////// - /////// 删除一条或多条数据 - /////// - /////// string - /////// - ////public int Delete(object[] ids) - ////{ - //// return Context.Deleteable().In(ids).RemoveDataCache().ExecuteCommand(); - ////} - - /////// - /////// 根据条件删除一条或多条数据 - /////// - /////// 过滤条件 - /////// - ////public int Delete(Expression> where) - ////{ - //// return Context.Deleteable().Where(where).RemoveDataCache().ExecuteCommand(); - ////} - - //public int DeleteTable() + //public Task> QueryableToListAsync(Expression> expression) //{ - // return Context.Deleteable().RemoveDataCache().ExecuteCommand(); + // return Context.Queryable().Where(expression).ToListAsync(); //} - //#endregion + //public string QueryableToJson(string select, Expression> expressionWhere) + //{ + // var query = base.Context.Queryable().Select(select).Where(expressionWhere).ToList(); + // return query.JilToJson(); + //} + + //public List QueryableToList(string tableName) + //{ + // return Context.Queryable(tableName).ToList(); + //} + + //public (List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10) + //{ + // int totalNumber = 0; + // var list = Context.Queryable().Where(expression).ToPageList(pageIndex, pageSize, ref totalNumber); + // return (list, totalNumber); + //} + + //public (List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10) + //{ + // int totalNumber = 0; + // var list = Context.Queryable().Where(expression).OrderBy(order).ToPageList(pageIndex, pageSize, ref totalNumber); + // return (list, totalNumber); + //} + + //public (List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10) + //{ + // int totalNumber = 0; + + // if (orderBy.Equals("DESC", StringComparison.OrdinalIgnoreCase)) + // { + // var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Desc).ToPageList(pageIndex, pageSize, ref totalNumber); + // return (list, totalNumber); + // } + // else + // { + // var list = Context.Queryable().Where(expression).OrderBy(orderFiled, OrderByType.Asc).ToPageList(pageIndex, pageSize, ref totalNumber); + // return (list, totalNumber); + // } + //} + + //public List SqlQueryToList(string sql, object obj = null) + //{ + // return Context.Ado.SqlQuery(sql, obj); + //} + /// + /// 获得一条数据 + /// + /// Expression> + /// + public T GetFirst(Expression> where) + { + return baseRepository.GetFirst(where); + } + + /// + /// 根据主值查询单条数据 + /// + /// 主键值 + /// 泛型实体 + public T GetId(object pkValue) + { + return baseRepository.GetId(pkValue); + } + /// + /// 根据条件查询分页数据 + /// + /// + /// + /// + public PagedInfo GetPages(Expression> where, PagerInfo parm) + { + var source = baseRepository.GetPages(where, parm); + + return source; + } + + public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, OrderByType orderEnum = OrderByType.Asc) + { + return baseRepository.GetPages(where, parm, order, orderEnum); + } + public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderByType) + { + return baseRepository.GetPages(where, parm, order, orderByType == "desc" ? OrderByType.Desc : OrderByType.Asc); + } + /// + /// 查询所有数据(无分页,请慎用) + /// + /// + public List GetAll(bool useCache = false, int cacheSecond = 3600) + { + return baseRepository.GetAll(useCache, cacheSecond); + } + + public int Count(Expression> where) + { + return baseRepository.Count(where); + } + #endregion query + + /// + /// 此方法不带output返回值 + /// var list = new List(); + /// list.Add(new SugarParameter(ParaName, ParaValue)); input + /// + /// + /// + /// + public DataTable UseStoredProcedureToDataTable(string procedureName, List parameters) + { + return baseRepository.UseStoredProcedureToDataTable(procedureName, parameters); + } + + /// + /// 带output返回值 + /// var list = new List(); + /// list.Add(new SugarParameter(ParaName, ParaValue, true)); output + /// list.Add(new SugarParameter(ParaName, ParaValue)); input + /// + /// + /// + /// + public (DataTable, List) UseStoredProcedureToTuple(string procedureName, List parameters) + { + return baseRepository.UseStoredProcedureToTuple(procedureName, parameters); + } + + //public string QueryableToJson(string select, Expression> expressionWhere) + //{ + // throw new NotImplementedException(); + //} } } diff --git a/ZR.Service/Business/GendemoService.cs b/ZR.Service/Business/GendemoService.cs deleted file mode 100644 index 8328c68..0000000 --- a/ZR.Service/Business/GendemoService.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Infrastructure; -using Infrastructure.Attribute; -using ZR.Model.Models; -using ZR.Repository; - -namespace ZR.Service.Business -{ - /// - /// 代码生成演示Service业务层处理 - /// - /// @author zr - /// @date 2021-11-24 - /// - [AppService(ServiceType = typeof(IGendemoService), ServiceLifetime = LifeTime.Transient)] - public class GendemoService: BaseService, IGendemoService - { - private readonly GendemoRepository _Gendemorepository; - public GendemoService(GendemoRepository repository) - { - _Gendemorepository = repository; - } - - #region 业务逻辑代码 - - #endregion - } -} \ No newline at end of file diff --git a/ZR.Service/Business/IBusService/IGendemoService.cs b/ZR.Service/Business/IBusService/IGendemoService.cs deleted file mode 100644 index 2274ec3..0000000 --- a/ZR.Service/Business/IBusService/IGendemoService.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using ZR.Model.Models; - -namespace ZR.Service.Business -{ - /// - /// 代码生成演示service接口 - /// - /// @author zr - /// @date 2021-11-24 - /// - public interface IGendemoService: IBaseService - { - } -} diff --git a/ZR.Service/Extensions/QueryableExtension.cs b/ZR.Service/Extensions/QueryableExtension.cs deleted file mode 100644 index d87b195..0000000 --- a/ZR.Service/Extensions/QueryableExtension.cs +++ /dev/null @@ -1,36 +0,0 @@ - -using Infrastructure.Model; -using SqlSugar; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using ZR.Model; -using ZR.Model.Vo; - -namespace ZR.Service -{ - public static class QueryableExtension - { - /// - /// 读取列表 - /// - /// - /// - /// - /// - /// - public static PagedInfo ToPage(this ISugarQueryable source, PagerInfo parm) - { - var page = new PagedInfo(); - var total = source.Count(); - page.TotalCount = total; - page.PageSize = parm.PageSize; - page.PageIndex = parm.PageNum; - - //page.DataSource = source.OrderByIF(!string.IsNullOrEmpty(parm.Sort), $"{parm.OrderBy} {(parm.Sort == "descending" ? "desc" : "asc")}").ToPageList(parm.PageNum, parm.PageSize); - page.Result = source.ToPageList(parm.PageNum, parm.PageSize); - return page; - } - - } -} diff --git a/ZR.Service/IBaseService.cs b/ZR.Service/IBaseService.cs index 3e0b4ba..a4354f0 100644 --- a/ZR.Service/IBaseService.cs +++ b/ZR.Service/IBaseService.cs @@ -2,8 +2,9 @@ using SqlSugar; using System; using System.Collections.Generic; +using System.Data; using System.Linq.Expressions; -using ZR.Repository; +using ZR.Model; namespace ZR.Service { @@ -11,200 +12,145 @@ namespace ZR.Service /// 基础服务定义 /// /// - public interface IBaseService : IBaseRepository where T : class, new() + public interface IBaseService where T : class, new() { - #region 添加操作 + #region add + int Add(T t); + + //int Insert(SqlSugarClient client, T t); + + //long InsertBigIdentity(T t); + IInsertable Insertable(T t); + int Insert(List t); + int Insert(T parm, Expression> iClumns = null, bool ignoreNull = true); + + //int InsertIgnoreNullColumn(List t); + + //int InsertIgnoreNullColumn(List t, params string[] columns); + + //DbResult InsertTran(T t); + + //DbResult InsertTran(List t); + long InsertReturnBigIdentity(T t); + //T InsertReturnEntity(T t); + + //T InsertReturnEntity(T t, string sqlWith = SqlWith.UpdLock); + + //bool ExecuteCommand(string sql, object parameters); + + //bool ExecuteCommand(string sql, params SugarParameter[] parameters); + + //bool ExecuteCommand(string sql, List parameters); + + #endregion add + + #region update + + bool Update(T entity, bool ignoreNullColumns = false); + /// - /// 添加一条数据 + /// 只更新表达式的值 /// + /// + /// + /// + bool Update(T entity, Expression> expression, bool ignoreAllNull = false); + + bool Update(T entity, Expression> expression, Expression> where); + + bool Update(SqlSugarClient client, T entity, Expression> expression, Expression> where); + + /// + /// + /// + /// T + /// 忽略更新 + /// Null不更新 + /// + //bool Update(T entity, List list = null, bool isNull = true); + + //bool Update(List entity); + bool Update(Expression> where, Expression> columns); + + #endregion update + + DbResult UseTran(Action action); + + DbResult UseTran(SqlSugarClient client, Action action); + + bool UseTran2(Action action); + + #region delete + + int Delete(Expression> expression); + int Delete(object[] obj); + int Delete(object id); + bool DeleteTable(); + + #endregion delete + + #region query + /// + /// 根据条件查询分页数据 + /// + /// /// /// - //int Add(T parm); + PagedInfo GetPages(Expression> where, PagerInfo parm); - //int Add(T parm, Expression> iClumns = null, bool ignoreNull = false); + PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, OrderByType orderEnum = OrderByType.Asc); + PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderType); + bool Any(Expression> expression); - ///// - ///// 批量添加数据 - ///// - ///// List - ///// - //int Add(List parm); + ISugarQueryable Queryable(); + List GetAll(bool useCache = false, int cacheSecond = 3600); - ///// - ///// 添加或更新数据 - ///// - ///// - ///// - //T Saveable(T parm, Expression> uClumns = null, Expression> iColumns = null); + //ISugarQueryable Queryable(string tableName, string shortName); - ///// - ///// 批量添加或更新数据 - ///// - ///// List - ///// - //List Saveable(List parm, Expression> uClumns = null, Expression> iColumns = null); + //ISugarQueryable Queryable() where T1 : class where T2 : new(); + List GetList(Expression> expression); + //Task> QueryableToListAsync(Expression> expression); - //#endregion + //string QueryableToJson(string select, Expression> expressionWhere); - //#region 查询操作 + //List QueryableToList(string tableName); - ///// - ///// 根据条件查询数据是否存在 - ///// - ///// 条件表达式树 - ///// - //bool Any(Expression> where); + //(List, int) QueryableToPage(Expression> expression, int pageIndex = 0, int pageSize = 10); - ///// - ///// 根据条件合计字段 - ///// - ///// 条件表达式树 - ///// - //TResult Sum(Expression> where, Expression> field); + //(List, int) QueryableToPage(Expression> expression, string order, int pageIndex = 0, int pageSize = 10); + //(List, int) QueryableToPage(Expression> expression, Expression> orderFiled, string orderBy, int pageIndex = 0, int pageSize = 10); - ///// - ///// 根据主值查询单条数据 - ///// - ///// 主键值 - ///// 泛型实体 - //T GetId(object pkValue); + //(List, int) QueryableToPage(Expression> expression, Bootstrap.BootstrapParams bootstrap); + //List SqlQueryToList(string sql, object obj = null); + /// + /// 获得一条数据 + /// + /// Expression> + /// + T GetFirst(Expression> where); + T GetId(object pkValue); - ///// - ///// 根据主键查询多条数据 - ///// - ///// - ///// - //List GetIn(object[] ids); - - - ///// - ///// 根据条件取条数 - ///// - ///// 条件表达式树 - ///// - //int GetCount(Expression> where); - - - ///// - ///// 查询所有数据(无分页,请慎用) - ///// - ///// - //List GetAll(bool useCache = false, int cacheSecond = 3600); - - - ///// - ///// 获得一条数据 - ///// - ///// Expression> - ///// - //T GetFirst(Expression> where); - - - ///// - ///// 获得一条数据 - ///// - ///// string - ///// + /// + /// 获得一条数据 + /// + /// string + /// //T GetFirst(string parm); - ///// - ///// 根据条件查询分页数据 - ///// - ///// - ///// - ///// - //PagedInfo GetPages(Expression> where, Model.PagerInfo parm); + int Count(Expression> where); - ///// - ///// 根据条件查询分页 - ///// - ///// - ///// - ///// - ///// - ///// - //PagedInfo GetPages(Expression> where, Model.PagerInfo parm, Expression> order, string orderEnum = "Asc"); + #endregion query - ///// - ///// 根据条件查询数据 - ///// - ///// 条件表达式树 - ///// - ////List GetWhere(Expression> where, bool useCache = false, int cacheSecond = 3600); + #region Procedure - /////// - /////// 根据条件查询数据 - /////// - /////// 条件表达式树 - /////// - ////List GetWhere(Expression> where, Expression> order, string orderEnum = "Asc", bool useCache = false, int cacheSecond = 3600); + DataTable UseStoredProcedureToDataTable(string procedureName, List parameters); + (DataTable, List) UseStoredProcedureToTuple(string procedureName, List parameters); - //#endregion - - //#region 修改操作 - - ///// - ///// 修改一条数据 - ///// - ///// T - ///// - //int Update(T parm); - - - ///// - ///// 批量修改 - ///// - ///// T - ///// - //int Update(List parm); - - - ///// - ///// 按查询条件更新 - ///// - ///// - ///// - ///// - //int Update(Expression> where, Expression> columns); - - - //#endregion - - //#region 删除操作 - - ///// - ///// 删除一条或多条数据 - ///// - ///// string - ///// - //int Delete(object id); - - - ///// - ///// 删除一条或多条数据 - ///// - ///// string - ///// - //int Delete(object[] ids); - - ///// - ///// 根据条件删除一条或多条数据 - ///// - ///// 过滤条件 - ///// - //int Delete(Expression> where); - - ///// - ///// 清空表 - ///// - ///// - //int DeleteTable(); - #endregion - + #endregion Procedure } } \ No newline at end of file diff --git a/ZR.Service/System/ArticleCategoryService.cs b/ZR.Service/System/ArticleCategoryService.cs index 7ef4573..7bc2a9f 100644 --- a/ZR.Service/System/ArticleCategoryService.cs +++ b/ZR.Service/System/ArticleCategoryService.cs @@ -1,7 +1,10 @@ using Infrastructure.Attribute; +using SqlSugar; +using SqlSugar.IOC; using System.Collections.Generic; using System.Linq; using ZR.Model.System; +using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -12,6 +15,9 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(IArticleCategoryService), ServiceLifetime = LifeTime.Transient)] public class ArticleCategoryService : BaseService, IArticleCategoryService { + public ArticleCategoryService(ArticleCategoryRepository repository) : base(repository) + { + } /// /// 构建前端所需要树结构 /// diff --git a/ZR.Service/System/ArticleService.cs b/ZR.Service/System/ArticleService.cs index 863efa9..5a74be4 100644 --- a/ZR.Service/System/ArticleService.cs +++ b/ZR.Service/System/ArticleService.cs @@ -1,5 +1,7 @@ using Infrastructure.Attribute; +using SqlSugar; using ZR.Model.System; +using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System @@ -10,6 +12,8 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(IArticleService), ServiceLifetime = LifeTime.Transient)] public class ArticleService : BaseService
, IArticleService { - + public ArticleService(ArticleRepository repository) : base(repository) + { + } } } diff --git a/ZR.Service/System/GenTableService.cs b/ZR.Service/System/GenTableService.cs index b9a5ddb..62454fe 100644 --- a/ZR.Service/System/GenTableService.cs +++ b/ZR.Service/System/GenTableService.cs @@ -1,11 +1,11 @@ using Infrastructure.Attribute; using Infrastructure.Extensions; -using Infrastructure.Model; using Newtonsoft.Json; using SqlSugar; using System; using System.Collections.Generic; using System.Linq; +using ZR.Model; using ZR.Model.System.Generate; using ZR.Repository.System; using ZR.Service.System.IService; @@ -16,11 +16,11 @@ namespace ZR.Service.System /// 代码生成表 ///
[AppService(ServiceType = typeof(IGenTableService), ServiceLifetime = LifeTime.Transient)] - public class GenTableService : IGenTableService + public class GenTableService : BaseService, IGenTableService { private GenTableRepository GenTableRepository; private IGenTableColumnService GenTableColumnService; - public GenTableService(IGenTableColumnService genTableColumnService, GenTableRepository genTableRepository) + public GenTableService(IGenTableColumnService genTableColumnService, GenTableRepository genTableRepository) : base(genTableRepository) { GenTableColumnService = genTableColumnService; GenTableRepository = genTableRepository; @@ -54,7 +54,26 @@ namespace ZR.Service.System /// public GenTable GetGenTableInfo(long tableId) { - return GenTableRepository.GetId(tableId); + var info = GenTableRepository.GetId(tableId); + SetTableFromOptions(info); + + return info; + } + + /// + /// 设置代码生成其他参数 + /// + /// + private void SetTableFromOptions(GenTable genTable) + { + //附加参数，key，value格式 + if (!string.IsNullOrEmpty(genTable?.Options)) + { + Dictionary options = JsonConvert.DeserializeObject>(genTable.Options); + genTable.ParentMenuId = options.GetValueOrDefault("parentMenuId") ?? null; + genTable.SortType = options.GetValueOrDefault("sortType") ?? "asc"; + genTable.SortField = options.GetValueOrDefault("sortField") ?? null; + } } /// @@ -108,11 +127,11 @@ namespace ZR.Service.System /// 代码生成表列 /// [AppService(ServiceType = typeof(IGenTableColumnService), ServiceLifetime = LifeTime.Transient)] - public class GenTableColumnService : IGenTableColumnService + public class GenTableColumnService : BaseService, IGenTableColumnService { private GenTableColumnRepository GetTableColumnRepository; - public GenTableColumnService(GenTableColumnRepository genTableColumnRepository) + public GenTableColumnService(GenTableColumnRepository genTableColumnRepository) : base(genTableColumnRepository) { GetTableColumnRepository = genTableColumnRepository; } diff --git a/ZR.Service/System/IService/IGenTableService.cs b/ZR.Service/System/IService/IGenTableService.cs index 7adc936..9a996b7 100644 --- a/ZR.Service/System/IService/IGenTableService.cs +++ b/ZR.Service/System/IService/IGenTableService.cs @@ -1,14 +1,10 @@ -using Infrastructure.Model; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; +using ZR.Model; using ZR.Model.System.Generate; namespace ZR.Service.System.IService { - public interface IGenTableService + public interface IGenTableService: IBaseService { List SelectDbTableListByNamess(string[] tableNames); @@ -21,7 +17,7 @@ namespace ZR.Service.System.IService int UpdateGenTable(GenTable genTable); } - public interface IGenTableColumnService + public interface IGenTableColumnService: IBaseService { int InsertGenTableColumn(List tableColumn); diff --git a/ZR.Service/Business/IBusService/ISysConfigService.cs b/ZR.Service/System/IService/ISysConfigService.cs similarity index 84% rename from ZR.Service/Business/IBusService/ISysConfigService.cs rename to ZR.Service/System/IService/ISysConfigService.cs index 182b403..d103154 100644 --- a/ZR.Service/Business/IBusService/ISysConfigService.cs +++ b/ZR.Service/System/IService/ISysConfigService.cs @@ -1,5 +1,4 @@ using System; -using ZR.Model.Models; using ZR.Model.System; namespace ZR.Service.System @@ -12,5 +11,6 @@ namespace ZR.Service.System /// public interface ISysConfigService: IBaseService { + SysConfig GetSysConfigByKey(string key); } } diff --git a/ZR.Service/System/IService/ISysDictDataService.cs b/ZR.Service/System/IService/ISysDictDataService.cs index 7d57d66..8380ffa 100644 --- a/ZR.Service/System/IService/ISysDictDataService.cs +++ b/ZR.Service/System/IService/ISysDictDataService.cs @@ -1,13 +1,15 @@ -using System; +using Infrastructure.Model; +using System; using System.Collections.Generic; using System.Text; +using ZR.Model; using ZR.Model.System; namespace ZR.Service.System.IService { public interface ISysDictDataService { - public List SelectDictDataList(SysDictData dictData); + public PagedInfo SelectDictDataList(SysDictData dictData, PagerInfo pagerInfo); public List SelectDictDataByType(string dictType); public SysDictData SelectDictDataById(long dictCode); public long InsertDictData(SysDictData dict); diff --git a/ZR.Service/System/IService/ISysDictService.cs b/ZR.Service/System/IService/ISysDictService.cs index d1728f1..7e4313f 100644 --- a/ZR.Service/System/IService/ISysDictService.cs +++ b/ZR.Service/System/IService/ISysDictService.cs @@ -1,6 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; +using ZR.Model; using ZR.Model.System; namespace ZR.Service.System.IService @@ -11,7 +11,7 @@ namespace ZR.Service.System.IService public interface ISysDictService { public List GetAll(); - public List SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager); + public PagedInfo SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager); /// /// 校验字典类型称是否唯一 diff --git a/ZR.Service/System/IService/ISysFileService.cs b/ZR.Service/System/IService/ISysFileService.cs index 99daf07..ff1b047 100644 --- a/ZR.Service/System/IService/ISysFileService.cs +++ b/ZR.Service/System/IService/ISysFileService.cs @@ -1,9 +1,24 @@ using Infrastructure.Attribute; -using ZR.Model.System; +using Microsoft.AspNetCore.Http; namespace ZR.Service.System.IService { public interface ISysFileService { + (bool, string) SaveFile(string picdir, IFormFile formFile); + + /// + /// 按时间来创建文件夹 + /// + /// + /// eg: 2020/11/3 + string GetdirPath(string path = ""); + + /// + /// 取文件名的MD5值(16位) + /// + /// 文件名，不包括扩展名 + /// + string HashFileName(string str = null); } } diff --git a/ZR.Service/System/IService/ISysOperLogService.cs b/ZR.Service/System/IService/ISysOperLogService.cs index 7f9eb76..fe6948b 100644 --- a/ZR.Service/System/IService/ISysOperLogService.cs +++ b/ZR.Service/System/IService/ISysOperLogService.cs @@ -3,6 +3,7 @@ using ZR.Model; using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Service.System; +using Infrastructure.Model; namespace ZR.Service.System.IService { @@ -16,7 +17,7 @@ namespace ZR.Service.System.IService /// 操作日志对象 /// /// 操作日志集合 - public List SelectOperLogList(SysOperLogDto operLog, PagerInfo pager); + public PagedInfo SelectOperLogList(SysOperLogDto operLog, PagerInfo pager); /// /// 清空操作日志 diff --git a/ZR.Service/System/IService/ISysRoleService.cs b/ZR.Service/System/IService/ISysRoleService.cs index b4947f1..9c9f4a4 100644 --- a/ZR.Service/System/IService/ISysRoleService.cs +++ b/ZR.Service/System/IService/ISysRoleService.cs @@ -1,8 +1,5 @@ -using Infrastructure.Model; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; +using ZR.Model; using ZR.Model.System; namespace ZR.Service.System.IService diff --git a/ZR.Service/System/IService/ISysTasksLogService.cs b/ZR.Service/System/IService/ISysTasksLogService.cs index cf0f16e..fe0815d 100644 --- a/ZR.Service/System/IService/ISysTasksLogService.cs +++ b/ZR.Service/System/IService/ISysTasksLogService.cs @@ -10,6 +10,6 @@ namespace ZR.Service.System.IService /// /// //public int AddTaskLog(string jobId); - public SysTasksLog AddTaskLog(string jobId, SysTasksLog tasksLog); + SysTasksLog AddTaskLog(string jobId, SysTasksLog tasksLog); } } diff --git a/ZR.Service/System/SysConfigService.cs b/ZR.Service/System/SysConfigService.cs index 8684572..9b2f8a5 100644 --- a/ZR.Service/System/SysConfigService.cs +++ b/ZR.Service/System/SysConfigService.cs @@ -1,13 +1,4 @@ -using Infrastructure; using Infrastructure.Attribute; -using Infrastructure.Extensions; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using ZR.Common; -using ZR.Model.Models; using ZR.Model.System; using ZR.Repository; @@ -15,21 +6,23 @@ namespace ZR.Service.System { /// /// 参数配置Service业务层处理 - /// - /// @author zhaorui - /// @date 2021-09-29 /// [AppService(ServiceType = typeof(ISysConfigService), ServiceLifetime = LifeTime.Transient)] - public class SysConfigService: BaseService, ISysConfigService + public class SysConfigService : BaseService, ISysConfigService { private readonly SysConfigRepository _SysConfigrepository; - public SysConfigService(SysConfigRepository repository) + public SysConfigService(SysConfigRepository repository) : base(repository) { _SysConfigrepository = repository; } #region 业务逻辑代码 + public SysConfig GetSysConfigByKey(string key) + { + return _SysConfigrepository.Queryable().First(f => f.ConfigKey == key); + } + #endregion } } \ No newline at end of file diff --git a/ZR.Service/System/SysDeptService.cs b/ZR.Service/System/SysDeptService.cs index 359e5ff..14da4b7 100644 --- a/ZR.Service/System/SysDeptService.cs +++ b/ZR.Service/System/SysDeptService.cs @@ -22,7 +22,7 @@ namespace ZR.Service.System { public SysDeptRepository DeptRepository; - public SysDeptService(SysDeptRepository deptRepository) + public SysDeptService(SysDeptRepository deptRepository) : base(deptRepository) { DeptRepository = deptRepository; } diff --git a/ZR.Service/System/SysDictDataService.cs b/ZR.Service/System/SysDictDataService.cs index 2c698c8..7a13527 100644 --- a/ZR.Service/System/SysDictDataService.cs +++ b/ZR.Service/System/SysDictDataService.cs @@ -1,20 +1,25 @@ using Infrastructure.Attribute; +using Infrastructure.Model; using System; using System.Collections.Generic; using System.Text; using ZR.Common; +using ZR.Model; using ZR.Model.System; using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System { + /// + /// 字典数据类 + /// [AppService(ServiceType = typeof(ISysDictDataService), ServiceLifetime = LifeTime.Transient)] - public class SysDictDataService: ISysDictDataService + public class SysDictDataService : BaseService, ISysDictDataService { private readonly SysDictDataRepository SysDictDataRepository; - public SysDictDataService(SysDictDataRepository sysDictDataRepository) + public SysDictDataService(SysDictDataRepository sysDictDataRepository) : base(sysDictDataRepository) { SysDictDataRepository = sysDictDataRepository; } @@ -24,15 +29,15 @@ namespace ZR.Service.System /// /// /// - public List SelectDictDataList(SysDictData dictData) + public PagedInfo SelectDictDataList(SysDictData dictData, PagerInfo pagerInfo) { - return SysDictDataRepository.SelectDictDataList(dictData); + return SysDictDataRepository.SelectDictDataList(dictData, pagerInfo); } /// /// 根据字典类型查询 /// - /// + /// /// public List SelectDictDataByType(string dictType) { diff --git a/ZR.Service/System/SysDictService.cs b/ZR.Service/System/SysDictService.cs index e90db62..ba21897 100644 --- a/ZR.Service/System/SysDictService.cs +++ b/ZR.Service/System/SysDictService.cs @@ -1,8 +1,8 @@ using Infrastructure; using Infrastructure.Attribute; -using System; using System.Collections.Generic; using System.Text; +using ZR.Model; using ZR.Model.System; using ZR.Repository.System; using ZR.Service.System.IService; @@ -13,12 +13,12 @@ namespace ZR.Service.System /// 字典类型 /// [AppService(ServiceType = typeof(ISysDictService), ServiceLifetime = LifeTime.Transient)] - public class SysDictService : ISysDictService + public class SysDictService : BaseService, ISysDictService { private SysDictRepository DictRepository; private SysDictDataRepository DictDataRepository; - public SysDictService(SysDictRepository sysDictRepository, SysDictDataRepository dictDataRepository) + public SysDictService(SysDictRepository sysDictRepository, SysDictDataRepository dictDataRepository) : base(sysDictRepository) { this.DictRepository = sysDictRepository; this.DictDataRepository = dictDataRepository; @@ -33,7 +33,7 @@ namespace ZR.Service.System /// /// 实体模型 /// - public List SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager) + public PagedInfo SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager) { return DictRepository.SelectDictTypeList(dictType, pager); } diff --git a/ZR.Service/System/SysFileService.cs b/ZR.Service/System/SysFileService.cs index 7a0741d..7a78c8b 100644 --- a/ZR.Service/System/SysFileService.cs +++ b/ZR.Service/System/SysFileService.cs @@ -1,6 +1,13 @@ using Infrastructure.Attribute; -using ZR.Model.System; +using Microsoft.AspNetCore.Http; +using System.IO; using ZR.Service.System.IService; +using ZR.Common; +using Infrastructure; +using System; +using System.Text; +using System.Security.Cryptography; +using System.Net; namespace ZR.Service.System { @@ -10,6 +17,57 @@ namespace ZR.Service.System [AppService(ServiceType = typeof(ISysFileService), ServiceLifetime = LifeTime.Transient)] public class SysFileService : ISysFileService { + private string domainUrl = ConfigUtils.Instance.GetConfig("ALIYUN_OSS:domainUrl"); + + /// + /// 上传文件到阿里云 + /// + /// + /// + /// + public (bool, string) SaveFile(string picdir, IFormFile formFile) + { + // eg: idcard/2020/08/18 + string dir = GetdirPath(picdir.ToString()); + string tempName = HashFileName(); + string fileExt = Path.GetExtension(formFile.FileName); + string fileName = $"{tempName}{fileExt}"; + string webUrl = $"{domainUrl}/{dir}/{fileName}"; + + HttpStatusCode statusCode = AliyunOssHelper.PutObjectFromFile(formFile.OpenReadStream(), Path.Combine(dir, fileName)); + + if (statusCode == HttpStatusCode.OK) + { + return (true, webUrl); + } + return (false, ""); + } + + public string GetdirPath(string path = "") + { + DateTime date = DateTime.Now; + int year = date.Year; + int month = date.Month; + int day = date.Day; + //int hour = date.Hour; + + string timeDir = $"{year}/{month}/{day}";// date.ToString("yyyyMM/dd/HH/"); + if (!string.IsNullOrEmpty(path)) + { + timeDir = path + "/" + timeDir; + } + return timeDir; + } + + public string HashFileName(string str = null) + { + if (string.IsNullOrEmpty(str)) + { + str = Guid.NewGuid().ToString(); + } + MD5CryptoServiceProvider md5 = new(); + return BitConverter.ToString(md5.ComputeHash(Encoding.Default.GetBytes(str)), 4, 8).Replace("-", ""); + } } } diff --git a/ZR.Service/System/SysLoginService.cs b/ZR.Service/System/SysLoginService.cs index 020e14b..8f73529 100644 --- a/ZR.Service/System/SysLoginService.cs +++ b/ZR.Service/System/SysLoginService.cs @@ -19,7 +19,7 @@ namespace ZR.Service.System { private SysLogininfoRepository SysLogininfoRepository; - public SysLoginService(SysLogininfoRepository sysLogininfo) + public SysLoginService(SysLogininfoRepository sysLogininfo): base(sysLogininfo) { SysLogininfoRepository = sysLogininfo; } diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs index cbc39c6..1afff0b 100644 --- a/ZR.Service/System/SysMenuService.cs +++ b/ZR.Service/System/SysMenuService.cs @@ -15,14 +15,14 @@ namespace ZR.Service /// 菜单 ///
[AppService(ServiceType = typeof(ISysMenuService), ServiceLifetime = LifeTime.Transient)] - public class SysMenuService: ISysMenuService + public class SysMenuService : BaseService, ISysMenuService { public SysMenuRepository MenuRepository; public ISysRoleService SysRoleService; public SysMenuService( - SysMenuRepository menuRepository, - ISysRoleService sysRoleService) + SysMenuRepository menuRepository, + ISysRoleService sysRoleService) : base(menuRepository) { MenuRepository = menuRepository; SysRoleService = sysRoleService; diff --git a/ZR.Service/System/SysOperLogService.cs b/ZR.Service/System/SysOperLogService.cs index 043ba8c..7af4626 100644 --- a/ZR.Service/System/SysOperLogService.cs +++ b/ZR.Service/System/SysOperLogService.cs @@ -6,6 +6,7 @@ using ZR.Model.System; using ZR.Repository.System; using ZR.Service.System.IService; using Infrastructure; +using Infrastructure.Model; namespace ZR.Service.System { @@ -13,11 +14,11 @@ namespace ZR.Service.System /// 操作日志 /// [AppService(ServiceType = typeof(ISysOperLogService), ServiceLifetime = LifeTime.Transient)] - public class SysOperLogService : ISysOperLogService + public class SysOperLogService : BaseService, ISysOperLogService { public SysOperLogRepository sysOperLogRepository; - public SysOperLogService(SysOperLogRepository sysOperLog) + public SysOperLogService(SysOperLogRepository sysOperLog) : base(sysOperLog) { sysOperLogRepository = sysOperLog; } @@ -37,7 +38,7 @@ namespace ZR.Service.System /// 操作日志对象 /// /// 操作日志集合 - public List SelectOperLogList(SysOperLogDto operLog, PagerInfo pager) + public PagedInfo SelectOperLogList(SysOperLogDto operLog, PagerInfo pager) { operLog.BeginTime = DateTimeHelper.GetBeginTime(operLog.BeginTime, -1); operLog.EndTime = DateTimeHelper.GetBeginTime(operLog.EndTime, 1); diff --git a/ZR.Service/System/SysPermissionService.cs b/ZR.Service/System/SysPermissionService.cs index 607d3f9..7ebf695 100644 --- a/ZR.Service/System/SysPermissionService.cs +++ b/ZR.Service/System/SysPermissionService.cs @@ -8,6 +8,9 @@ using ZR.Service.System.IService; namespace ZR.Service.System { + /// + /// 角色权限 + /// [AppService(ServiceType = typeof(ISysPermissionService), ServiceLifetime = LifeTime.Transient)] public class SysPermissionService : ISysPermissionService { diff --git a/ZR.Service/System/SysPostService.cs b/ZR.Service/System/SysPostService.cs index 5a5e977..0767784 100644 --- a/ZR.Service/System/SysPostService.cs +++ b/ZR.Service/System/SysPostService.cs @@ -16,7 +16,7 @@ namespace ZR.Service.System public class SysPostService : BaseService, ISysPostService { public SysPostRepository PostRepository; - public SysPostService(SysPostRepository postRepository) + public SysPostService(SysPostRepository postRepository): base(postRepository) { PostRepository = postRepository; } diff --git a/ZR.Service/System/SysTasksLogService.cs b/ZR.Service/System/SysTasksLogService.cs index 7b7ae0d..f2a2ace 100644 --- a/ZR.Service/System/SysTasksLogService.cs +++ b/ZR.Service/System/SysTasksLogService.cs @@ -1,11 +1,16 @@ using Infrastructure.Attribute; using System; +using System.Linq.Expressions; +using ZR.Model; using ZR.Model.System; using ZR.Repository; using ZR.Service.System.IService; namespace ZR.Service.System { + /// + /// 任务日志 + /// [AppService(ServiceLifetime = LifeTime.Transient, ServiceType = typeof(ISysTasksLogService))] public class SysTasksLogService : BaseRepository, ISysTasksLogService { @@ -31,5 +36,10 @@ namespace ZR.Service.System Add(logModel); return logModel; } + + public PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderType) + { + throw new NotImplementedException(); + } } } diff --git a/ZR.Service/System/SysTasksQzService.cs b/ZR.Service/System/SysTasksQzService.cs index 1569287..17e6e85 100644 --- a/ZR.Service/System/SysTasksQzService.cs +++ b/ZR.Service/System/SysTasksQzService.cs @@ -1,12 +1,18 @@ using Infrastructure.Attribute; using ZR.Model.System; +using ZR.Repository.System; using ZR.Service.System.IService; namespace ZR.Service.System { + /// + /// 定时任务 + /// [AppService(ServiceType = typeof(ISysTasksQzService), ServiceLifetime = LifeTime.Transient)] public class SysTasksQzService : BaseService, ISysTasksQzService { - + public SysTasksQzService(SysTasksQzRepository repository) : base(repository) + { + } } } diff --git a/ZR.Service/System/SysUserRoleService.cs b/ZR.Service/System/SysUserRoleService.cs index 94bdfc1..183b10f 100644 --- a/ZR.Service/System/SysUserRoleService.cs +++ b/ZR.Service/System/SysUserRoleService.cs @@ -9,6 +9,9 @@ using ZR.Service.System.IService; namespace ZR.Service.System { + /// + /// 用户角色 + /// [AppService(ServiceType = typeof(ISysUserRoleService),ServiceLifetime = LifeTime.Transient)] public class SysUserRoleService: ISysUserRoleService { diff --git a/ZR.Service/System/SysUserService.cs b/ZR.Service/System/SysUserService.cs index 2fe57d4..92e08a6 100644 --- a/ZR.Service/System/SysUserService.cs +++ b/ZR.Service/System/SysUserService.cs @@ -10,6 +10,9 @@ using ZR.Service.System.IService; namespace ZR.Service { + /// + /// 系统用户 + /// [AppService(ServiceType = typeof(ISysUserService), ServiceLifetime = LifeTime.Transient)] public class SysUserService : BaseService, ISysUserService { @@ -22,7 +25,7 @@ namespace ZR.Service SysUserRepository userRepository, ISysRoleService sysRoleService, ISysUserRoleService userRoleService, - ISysUserPostService userPostService) + ISysUserPostService userPostService) : base(userRepository) { UserRepository = userRepository; RoleService = sysRoleService; diff --git a/ZR.Vue/.jsbeautifyrc b/ZR.Vue/.jsbeautifyrc new file mode 100644 index 0000000..d79fae6 --- /dev/null +++ b/ZR.Vue/.jsbeautifyrc @@ -0,0 +1,12 @@ +{ + "brace_style": "none,preserve-inline", + "indent_size": 2, + "indent_char": " ", + "jslint_happy": true, + "unformatted": [ + "" + ], + "css": { + "indent_size": 2 + } +} \ No newline at end of file diff --git a/ZR.Vue/package.json b/ZR.Vue/package.json index 873c7e6..05b455e 100644 --- a/ZR.Vue/package.json +++ b/ZR.Vue/package.json @@ -1,7 +1,6 @@ { - "name": "zr", - "version": "1.0.0", - "description": "管理系统", + "name": "zradmin", + "description": "ZrAdmnin.NET管理系统", "author": "ZR", "scripts": { "dev": "vue-cli-service serve", diff --git a/ZR.Vue/src/api/common.js b/ZR.Vue/src/api/common.js index b106f3b..a13d608 100644 --- a/ZR.Vue/src/api/common.js +++ b/ZR.Vue/src/api/common.js @@ -16,7 +16,7 @@ export function upload(data) { */ export function sendEmail(data) { return request({ - url: '/home/SendEmail', + url: '/common/SendEmail', method: 'POST', data: data, }) diff --git a/ZR.Vue/src/api/gendemo.js b/ZR.Vue/src/api/gendemo.js deleted file mode 100644 index 394e903..0000000 --- a/ZR.Vue/src/api/gendemo.js +++ /dev/null @@ -1,59 +0,0 @@ -import request from '@/utils/request' - -/** - * 代码生成演示分页查询 - * @param {查询条件} data - */ -export function listGendemo(query) { - return request({ - url: 'business/Gendemo/list', - method: 'get', - params: query, - }) -} - -/** - * 新增代码生成演示 - * @param data - */ -export function addGendemo(data) { - return request({ - url: 'business/Gendemo', - method: 'post', - data: data, - }) -} - -/** - * 修改代码生成演示 - * @param data - */ -export function updateGendemo(data) { - return request({ - url: 'business/Gendemo', - method: 'PUT', - data: data, - }) -} - -/** - * 获取代码生成演示详情 - * @param {Id} 代码生成演示Id - */ -export function getGendemo(id) { - return request({ - url: 'business/Gendemo/' + id, - method: 'get' - }) -} - -/** - * 删除 - * @param {主键} pid - */ -export function delGendemo(pid) { - return request({ - url: 'business/Gendemo/' + pid, - method: 'delete' - }) -} diff --git a/ZR.Vue/src/api/system/login.js b/ZR.Vue/src/api/system/login.js index 593f801..9adfb26 100644 --- a/ZR.Vue/src/api/system/login.js +++ b/ZR.Vue/src/api/system/login.js @@ -24,7 +24,7 @@ export function getInfo() { } // 退出方法 -export function logOut() { +export function logout() { return request({ url: '/LogOut', method: 'POST' diff --git a/ZR.Vue/src/components/TopNav/index.vue b/ZR.Vue/src/components/TopNav/index.vue index b34175e..e92d381 100644 --- a/ZR.Vue/src/components/TopNav/index.vue +++ b/ZR.Vue/src/components/TopNav/index.vue @@ -137,7 +137,7 @@ export default { window.open(key, "_blank"); } else if (key.indexOf("/redirect") !== -1) { // /redirect 路径内部打开 - this.$router.push({ path: key.replace("/redirect", "") }); + this.$router.push({ path: key.replace("/redirect", "") }).catch(err => {}); } else { // 显示左侧联动菜单 this.activeRoutes(key); diff --git a/ZR.Vue/src/components/UploadImage/index.vue b/ZR.Vue/src/components/UploadImage/index.vue index 87b3ee9..9b41c19 100644 --- a/ZR.Vue/src/components/UploadImage/index.vue +++ b/ZR.Vue/src/components/UploadImage/index.vue @@ -1,18 +1,9 @@ @@ -21,27 +12,78 @@ import { getToken } from "@/utils/auth"; export default { - components: {}, + name: "UploadImage", data() { return { - uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 + uploadImgUrl: process.env.VUE_APP_BASE_API + this.uploadUrl, // 上传的图片服务器地址 headers: { Authorization: "Bearer " + getToken(), }, + imageUrl: "", }; }, props: { - value: { + icon: { type: String, - default: "", }, + // 当前form 列名 + column: { type: String }, + // 上传地址 + uploadUrl: { + type: String, + default: "Common/UploadFile", + }, + // 文件类型, 例如['png', 'jpg', 'jpeg'] + fileType: { + type: Array, + default: () => ["png", "jpg", "jpeg"], + }, + // 大小限制(MB) + fileSize: { + type: Number, + default: 5, + }, + }, + mounted() { + this.imageUrl = this.icon; }, methods: { handleUploadSuccess(res) { - this.$emit("input", res.url); + this.$emit(`handleUploadSuccess`, res, this.column); + this.imageUrl = res.data; this.loading.close(); }, - handleBeforeUpload() { + // 上传前loading加载 + handleBeforeUpload(file) { + console.log(file) + let isImg = false; + if (this.fileType.length) { + let fileExtension = ""; + if (file.name.lastIndexOf(".") > -1) { + fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1); + } + isImg = this.fileType.some((type) => { + if (file.type.indexOf(type) > -1) return true; + if (fileExtension && fileExtension.indexOf(type) > -1) return true; + return false; + }); + } else { + isImg = file.type.indexOf("image") > -1; + } + + if (!isImg) { + this.msgError( + `文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!` + ); + return false; + } + if (this.fileSize) { + const isLt = file.size / 1024 / 1024 < this.fileSize; + if (!isLt) { + this.msgError(`上传头像图片大小不能超过 ${this.fileSize} MB!`); + return false; + } + } this.loading = this.$loading({ lock: true, text: "上传中", diff --git a/ZR.Vue/src/main.js b/ZR.Vue/src/main.js index 408b53d..c16beb0 100644 --- a/ZR.Vue/src/main.js +++ b/ZR.Vue/src/main.js @@ -21,10 +21,14 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, import Pagination from "@/components/Pagination"; //自定义表格工具扩展 import RightToolbar from "@/components/RightToolbar" +// 富文本组件 +import Editor from "@/components/Editor"; // 字典标签组件 import DictTag from '@/components/DictTag' // 字典数据组件 // import DictData from '@/components/DictData' +// 上传图片 +import UploadImage from '@/components/UploadImage/index'; // 全局方法挂载 Vue.prototype.getDicts = getDicts @@ -53,18 +57,10 @@ Vue.prototype.msgInfo = function(msg) { Vue.component('Pagination', Pagination) Vue.component('RightToolbar', RightToolbar) Vue.component('DictTag', DictTag) - +Vue.component('Editor', Editor) +Vue.component('UploadImage', UploadImage) Vue.use(permission) -/** - * If you don't want to use mock-server - * you want to use MockJs for mock api - * you can execute: mockXHR() - * - * Currently MockJs will be used in the production environment, - * please remove it before going online! ! ! - */ - Vue.use(Element, { size: Cookies.get('size') || 'medium' // set element-ui default size }) @@ -76,4 +72,5 @@ new Vue({ router, store, render: h => h(App) -}) \ No newline at end of file +}) +console.log('后端地址:' + process.env.VUE_APP_BASE_API) \ No newline at end of file diff --git a/ZR.Vue/src/permission.js b/ZR.Vue/src/permission.js index 2b3b080..924803a 100644 --- a/ZR.Vue/src/permission.js +++ b/ZR.Vue/src/permission.js @@ -5,55 +5,41 @@ import NProgress from 'nprogress' import 'nprogress/nprogress.css' import { getToken } from '@/utils/auth' -NProgress.configure({ showSpinner: false }) +NProgress.configure({ + showSpinner: false +}) const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/demo'] router.beforeEach((to, from, next) => { NProgress.start() - console.log(to.path); - const hasToken = getToken() + console.log('router to ' + to.path); - if (hasToken) { + if (getToken()) { /* has token*/ if (to.path === '/login') { next({ path: '/' }) NProgress.done() } else { if (store.getters.roles.length === 0) { - // 判断当前用户是否已拉取完user_info信息 - store.dispatch('GetInfo').then(res => { - //console.log('拉取userInfo', JSON.stringify(res)) - // 拉取user_info - const roles = res.data.roles - store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => { - - // 测试 默认静态页面 - // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => { - // 根据roles权限生成可访问的路由表 + store.dispatch('GetInfo').then(() => { + store.dispatch('GenerateRoutes').then(accessRoutes => { router.addRoutes(accessRoutes) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 }) - next() + //next() }).catch(err => { console.error(err) - //这部不能少，否则会出现死循环 - store.dispatch('FedLogOut').then(() => { - Message.error(err) + store.dispatch('LogOut').then(() => { + console.log('弹框登录失败') + Message.error(err != undefined ? err : '登录失败') next({ path: '/' }) }) - next(`/login?redirect=${to.path}`) + //next(`/login`) }) } else { next() - // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓ - // if (hasPermission(store.getters.roles, to.meta.roles)) { - // next() - // } else { - // next({ path: '/401', replace: true, query: { noGoBack: true }}) - // } - // 可删 ↑ } } } else { @@ -70,4 +56,4 @@ router.beforeEach((to, from, next) => { router.afterEach(() => { NProgress.done() -}) +}) \ No newline at end of file diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js index 803cbc5..2b3221c 100644 --- a/ZR.Vue/src/settings.js +++ b/ZR.Vue/src/settings.js @@ -2,7 +2,7 @@ module.exports = { /** * 框架版本号 */ - version: '3.5.0', + version: '3.7.0', title: 'ZrAdmin.NET', /** * 主题颜色 diff --git a/ZR.Vue/src/store/modules/permission.js b/ZR.Vue/src/store/modules/permission.js index 093d46d..5493903 100644 --- a/ZR.Vue/src/store/modules/permission.js +++ b/ZR.Vue/src/store/modules/permission.js @@ -21,11 +21,11 @@ const permission = { }, SET_TOPBAR_ROUTES: (state, routes) => { // 顶部导航菜单默认添加统计报表栏指向首页 - // const index = [{ - // path: 'index', - // meta: { title: '系统首页', icon: 'dashboard' } - // }] - state.topbarRouters = routes; //.concat(index); + const index = [{ + // path: 'index', + // meta: { title: '系统首页', icon: 'dashboard' } + }] + state.topbarRouters = routes;//.concat(index); }, SET_SIDEBAR_ROUTERS: (state, routes) => { state.sidebarRouters = routes diff --git a/ZR.Vue/src/store/modules/user.js b/ZR.Vue/src/store/modules/user.js index 7a95dbd..32ed9ef 100644 --- a/ZR.Vue/src/store/modules/user.js +++ b/ZR.Vue/src/store/modules/user.js @@ -1,4 +1,4 @@ -import { login, logOut, getInfo } from '@/api/system/login' +import { login, logout, getInfo } from '@/api/system/login' import { getToken, setToken, removeToken } from '@/utils/auth' const user = { @@ -42,8 +42,8 @@ const user = { return new Promise((resolve, reject) => { login(username, password, code, uuid).then(res => { if (res.code == 200) { - //提交上面的mutaions方法 setToken(res.data) + //提交上面的mutaions方法 commit('SET_TOKEN', res.data) resolve()//then处理 } else { @@ -56,11 +56,7 @@ const user = { // 获取用户信息 GetInfo({ commit, state }) { return new Promise((resolve, reject) => { - getInfo(state.token).then(res => { - if (!res || res.code != 200) { - return reject(res.msg) - } - + getInfo().then(res => { const data = res.data const avatar = data.user.avatar == "" ? require("@/assets/image/profile.jpg") : data.user.avatar; @@ -83,13 +79,14 @@ const user = { // 退出系统 LogOut({ commit, state }) { + console.log('退出登录') return new Promise((resolve, reject) => { - logOut(state.token).then(() => { + logout().then((res) => { removeToken()// 必须先移除token commit('SET_TOKEN', '') commit('SET_ROLES', []) commit('SET_PERMISSIONS', []) - resolve() + resolve(res) }).catch(error => { reject(error) }) diff --git a/ZR.Vue/src/utils/auth.js b/ZR.Vue/src/utils/auth.js index 6163854..b83cc6d 100644 --- a/ZR.Vue/src/utils/auth.js +++ b/ZR.Vue/src/utils/auth.js @@ -8,7 +8,7 @@ export function getToken() { } export function setToken(token) { - console.log('set token=' + token) + // console.log('set token=' + token) return Cookies.set(TokenKey, token) } diff --git a/ZR.Vue/src/utils/request.js b/ZR.Vue/src/utils/request.js index a58006c..9cf7d49 100644 --- a/ZR.Vue/src/utils/request.js +++ b/ZR.Vue/src/utils/request.js @@ -1,7 +1,12 @@ import axios from 'axios' -import { MessageBox, Message } from 'element-ui' +import { + MessageBox, + Message +} from 'element-ui' import store from '@/store' -import { getToken } from '@/utils/auth' +import { + getToken +} from '@/utils/auth' // import errorCode from '@/utils/errorCode' // 解决后端跨域获取不到cookie问题 @@ -18,17 +23,11 @@ const service = axios.create({ // request拦截器 service.interceptors.request.use(config => { // 是否需要设置 token - // const isToken = (config.headers || {}).isToken === false - // if (getToken() && !isToken) { - // config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - // } - // return config - // console.log(store.getters) if (getToken()) { //将token放到请求头发送给服务器,将tokenkey放在请求头中 - config.headers.Token = getToken(); + config.headers['Authorization'] = 'Bearer ' + getToken(); } else { - console.log(config) + // console.log(config) } return config; }, error => { @@ -38,50 +37,46 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { - if (res.status !== 200) { - Promise.reject('network error'); - return; - } - // 未设置状态码则默认成功状态 - const code = res.data.code; - const msg = res.data.msg; - - if (code == 401) { - MessageBox.confirm('登录状态已过期，请重新登录', '系统提示', { - confirmButtonText: '重新登录', - cancelButtonText: '取消', - type: 'warning' + if (res.status !== 200) { + Promise.reject('network error'); + return; } - ).then(() => { - store.dispatch('LogOut').then(() => { - location.href = process.env.VUE_APP_ROUTER_PREFIX + '/index'; - }) - }) + // 未设置状态码则默认成功状态 + const { code , msg } = res.data; - return Promise.reject() - } - else if (code == 0 || code == 110 || code == 101 || code == 403 || code == 500) { - Message({ - message: msg, - type: 'error' - }) - return Promise.reject() - } - else { - //返回标准 code/msg/data字段 - return res.data; - } -}, + if (code == 401) { + MessageBox.confirm('登录状态已过期，请重新登录', '系统提示', { + confirmButtonText: '重新登录', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + store.dispatch('LogOut').then(() => { + location.href = process.env.VUE_APP_ROUTER_PREFIX + 'index'; + }) + }) + + return Promise.reject('无效的会话，或者会话已过期，请重新登录。') + } else if (code == 0 || code == 110 || code == 101 || code == 403 || code == 500) { + Message({ + message: msg, + type: 'error' + }) + return Promise.reject(msg) + } else { + //返回标准 code/msg/data字段 + return res.data; + } + }, error => { console.log('err' + error) - let { message } = error; + let { + message + } = error; if (message == "Network Error") { message = "后端接口连接异常"; - } - else if (message.includes("timeout")) { + } else if (message.includes("timeout")) { message = "系统接口请求超时"; - } - else if (message.includes("Request failed with status code")) { + } else if (message.includes("Request failed with status code")) { message = "系统接口" + message.substr(message.length - 3) + "异常"; } Message({ @@ -129,10 +124,10 @@ export function post(url, params) { } /** -* 提交表单 -* @param {*} url -* @param {*} data -*/ + * 提交表单 + * @param {*} url + * @param {*} data + */ export function postForm(url, data, config) { return new Promise((resolve, reject) => { axios.post(url, data, config).then(res => { diff --git a/ZR.Vue/src/utils/zipdownload.js b/ZR.Vue/src/utils/zipdownload.js index 500d371..f8cf764 100644 --- a/ZR.Vue/src/utils/zipdownload.js +++ b/ZR.Vue/src/utils/zipdownload.js @@ -14,7 +14,7 @@ export function downLoadZip(str, filename) { method: 'get', url: str, responseType: 'blob', - headers: { 'Token': getToken() } + headers: { 'Authorization': 'Bearer ' + getToken() } }).then(res => { resolveBlob(res, mimeMap.zip) }) @@ -25,7 +25,7 @@ export function downLoadExcel(str, filename) { method: 'get', url: url, responseType: 'blob', - headers: { 'Token': getToken() } + headers: { 'Authorization': 'Bearer ' + getToken() } }).then(res => { resolveExcel(res, filename) }) diff --git a/ZR.Vue/src/views/business/gendemo/index.vue b/ZR.Vue/src/views/business/gendemo/index.vue deleted file mode 100644 index a1bf969..0000000 --- a/ZR.Vue/src/views/business/gendemo/index.vue +++ /dev/null @@ -1,294 +0,0 @@ - - - diff --git a/ZR.Vue/src/views/components/dictData.vue b/ZR.Vue/src/views/components/dictData.vue index d83a2b2..1286a23 100644 --- a/ZR.Vue/src/views/components/dictData.vue +++ b/ZR.Vue/src/views/components/dictData.vue @@ -12,7 +12,7 @@ - 搜索 + 搜索 重置 diff --git a/ZR.Vue/src/views/index.vue b/ZR.Vue/src/views/index.vue index 8085410..22eeac4 100644 --- a/ZR.Vue/src/views/index.vue +++ b/ZR.Vue/src/views/index.vue @@ -43,6 +43,8 @@ Github + 更新日志 +

如果觉得不错欢迎给个⭐Star⭐收藏一下 ，这样作者才有继续免费下去的动力，谢谢！

@@ -62,7 +64,7 @@
  • Quartz.Net
  • MySql
  • Mapster
    • -
  • Epplus
    • +
  • Epplus
  • ...
    • @@ -98,56 +100,16 @@ 捐赠支持
    - 如果觉得有用你可以请作者喝杯咖啡☕表示鼓励 donate
    - + @@ -155,7 +117,7 @@ diff --git a/ZR.Vue/vue.config.js b/ZR.Vue/vue.config.js index 4a1fb79..4b9cde4 100644 --- a/ZR.Vue/vue.config.js +++ b/ZR.Vue/vue.config.js @@ -29,8 +29,8 @@ module.exports = { productionSourceMap: false, // webpack-dev-server 相关配置 devServer: { - host: '0.0.0.0', - port: 8887,// port, + host: '0.0.0.0',//项目启动host + port: 8887,// 项目启动port, open: true, proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy diff --git a/ZRAdmin.xml b/ZRAdmin.xml deleted file mode 100644 index 270066e..0000000 --- a/ZRAdmin.xml +++ /dev/null @@ -1,1016 +0,0 @@ - - - - ZR.Admin.WebApi - - - - - json输出带时间格式的 - - - - - - - - 响应返回结果 - - 受影响行数 - - - - - 全局Code使用 - - - - - - - - 代码生成演示Controller - - @author zr - @date 2021-10-10 - - - - - 代码生成演示接口 - - - - - 查询代码生成演示列表 - - - - - - 查询代码生成演示详情 - - - - - - - 添加代码生成演示 - - - - - - 更新代码生成演示 - - - - - - 删除代码生成演示 - - - - - - 代码生成 - - - - - 获取所有数据库的信息 - - - - - - 获取所有表根据数据名 - - 数据库名 - 表名 - 分页信息 - - - - - 代码生成器 - - 数据传输对象 - - - - - 获取代码生成表列表 - - 表名 - 分页信息 - - - - - 查询表字段列表 - - genTable表id - - - - - 删除代码生成 - - - - - - - 导入表结构（保存） - - - - - - - - 修改保存代码生成业务 - - 请求参数实体 - - - - - 预览代码 - - - - - - - 心跳 - - - - - - 加密 - - - - - - - 解密 - - - - - - - 发送邮件 - - 请求参数接收实体 - - - - - T4代码自动生成 - - - - - 文章接口 - - - - - 查询文章列表 - - - - - - 获取文章目录,前端没用到 - - - - - - 获取文章目录树 - - - - - - 查询文章详情 - - - - - - - 添加文章 - - - - - - 更新文章 - - - - - - 删除文章 - - - - - - 获取缓存监控数据 - - - - - - 获取服务器信息 - - - - - - 系统访问记录 - - - - - 查询登录日志 - /monitor/logininfor/list - - - - - - - - 清空登录日志 - /monitor/logininfor/clean - - - - - - /monitor/logininfor/1 - - - - - - - 查询操作日志 - - - - - - - 删除操作日志 - - - - - - - 清空操作日志 - - - - - - 参数配置Controller - - @author zhaorui - @date 2021-09-29 - - - - - 参数配置接口 - - - - - 查询参数配置列表 - - - - - - 查询参数配置详情 - - - - - - - 根据参数键名查询参数值 - - - - - - - 添加参数配置 - - - - - - 更新参数配置 - - - - - - 删除参数配置 - - - - - - 部门 - - - - - 获取部门列表 - - - - - - 查询部门列表（排除节点） - - - - - - - 获取部门下拉树列表 - - - - - - - 根据部门编号获取详细信息 - - - - - - 新增部门 - - - - - - - 修改部门 - - - - - - - 删除部门 - - - - - - 数据字典信息 - @author zr - - - - - 搜索 - - - - - - - - 根据字典类型查询字典数据信息 - - - - - - - 查询字典数据详细 - - - - - - - 添加 - - - - - - - 修改 - - - - - - - 删除字典类型 - - - - - - - 数据字典信息 - - - - - 查询 - - - - - - - - 查询字典类型详细 - - - - - - - 添加字典类型 - - - - - - - 修改字典类型 - - - - - - - 删除字典类型 - - - - - - 登录 - - - - - 登录 - - 登录对象 - - - - - 注销 - - - - - - 获取用户信息 - - - - - - 获取路由信息 - - - - - - 生成图片验证码 - - - - - - 获取菜单列表 √ - - - - - - 根据菜单编号获取详细信息 √ - - - - - - - 获取菜单下拉树列表(分配角色所需菜单) - - - - - - 获取角色菜单信息 - 加载对应角色菜单列表树 - - - - - - - 修改菜单 √ - - - - - - - 添加菜单 √ - - - - - - - 菜单删除 √ - - - - - - - 保存排序 - - - - - - - 岗位管理 - - - - - 岗位列表查询 - - - - - - 岗位查询 - - - - - - - 岗位管理 - - - - - - - 岗位管理 - - - - - - - 岗位删除 - - - - - - - 获取岗位选择框列表 - - - - - 个人中心用户信息获取 - - - - - - 修改用户 - - - - - - 修改密码 - - - - - - 修改头像 - - - - - - 角色信息 - - - - - 获取系统角色管理 - - - - - - 根据角色编号获取详细信息 - - - - - - - 添加角色 √ - - - - - - - 修改角色 √ - - - - - - - 根据角色分配菜单 - - - - - - - 角色删除 √ - - - - - - - 修改角色状态 √ - - 角色对象 - - - - - 用户管理 -> 获取用户 - /system/user/list - - - - - - 用户管理 -> 编辑、添加用户获取用户，信息查询 - - - - - - - 添加用户 - - - - - - - 修改用户 - - - - - - - 改变用户状态 - - - - - - - 删除用户 - - - - - - - 重置密码 - - - - - - 导入 ok - - 使用IFromFile必须使用name属性否则获取不到文件 - - - - - 用户模板 ok - - - - - - 根据角色编号获取已分配的用户 - - - - - - - 添加角色用户 - - - - - - 删除角色用户 - - - - - - - 获取未分配用户角色 - - - - - - - 查询日志 - - - - - - - - 删除定时任务调用日志 - - - - - - - 清空日志 - - - - - - 计划任务 - - - - - 查询计划任务列表 - - - - - - 查询单个计划任务 - - 编码 - - - - - 添加任务 - - - - - - 更新任务 - - - - - - 删除任务 - - - - - - 启动任务 - - - - - - 停止任务 - - - - - - 定时任务立即执行一次 - - - - - - - 存储文件 - - - - - - - HttpContext扩展类 - - - - - 是否是ajax请求 - - - - - - - 获取客户端IP - - - - - - - 获取请求令牌 - - - - - - - 登录cookie写入 - - - - - - - - 定时任务扩展方法 - - - - - 程序启动后添加任务计划 - - - - - - - API授权判断 - - - - - 权限字符串，例如 system:user:view - - - - - 执行Action前校验是否有权限访问 - - - - - - - - OnActionExecuting是在Action执行之前运行的方法。 - - - - - - OnActionExecuted是在Action中的代码执行之后运行的方法。 - - - - - - 记录请求，输出日志 - - - - - OnActionExecuted是在Action中的代码执行之后运行的方法。 - - - - - - 设置请求参数 - - - - - - - 授权校验访问 - 如果跳过授权登录在Action 或controller加上 AllowAnonymousAttribute - - - - - 只判断token是否正确，不判断权限 - 如果需要判断权限的在Action上加上ApiActionPermission属性标识权限类别，ActionPermissionFilter作权限处理 - - - - - - 记录用户登陆信息 - - - - - - - - - 2020-11-20 - - - - - 获取用户身份信息 - - - - - - - 生成token - - - - - - - 从令牌中获取数据声明 - - 令牌 - - - - - jwt token校验 - - - - - - - - 注册Services服务 - - - - - diff --git a/document/admin-mysql.sql b/document/admin-mysql.sql index b57bf4d..5ca36d6 100644 --- a/document/admin-mysql.sql +++ b/document/admin-mysql.sql @@ -525,7 +525,7 @@ CREATE TABLE `sys_user` ( -- ---------------------------- INSERT INTO `sys_user` VALUES (1, 0, 'admin', '管理员', '0', '', '', '0', '', 'e10adc3949ba59abbe56e057f20f883e', '0', '0', '127.0.0.1', '2021-08-23 14:03:17', 'admin', '2020-11-26 11:52:59', 'admin', '2021-08-03 10:11:24', '管理员'); INSERT INTO `sys_user` VALUES (2, 0, 'zr', 'zr', '0', NULL, NULL, '0', '', 'e10adc3949ba59abbe56e057f20f883e', '0', '0', '', '0001-01-01 00:00:00', 'admin', '2021-07-05 17:29:13', 'admin', '2021-08-02 16:53:04', '普通用户2'); -INSERT INTO `sys_user` VALUES (3, 100, 'editor', '编辑人员', '0', NULL, NULL, '2', 'http://www.izhaorui.cn/static/pay.jpg', 'E10ADC3949BA59ABBE56E057F20F883E', '0', '0', '127.0.0.1', '2021-08-19 09:27:46', 'admin', '2021-08-18 18:24:53', '', NULL, NULL); +INSERT INTO `sys_user` VALUES (3, 100, 'editor', '编辑人员', '0', NULL, NULL, '2', '', 'E10ADC3949BA59ABBE56E057F20F883E', '0', '0', '127.0.0.1', '2021-08-19 09:27:46', 'admin', '2021-08-18 18:24:53', '', NULL, NULL); SET FOREIGN_KEY_CHECKS = 1; @@ -636,7 +636,7 @@ create table sys_config ( insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '初始化密码 123456' ); insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' ); --- insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaOnOff', 'true', 'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，false关闭）'); +insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaOnOff', 'true', 'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（off、关闭，1、动态验证码 2、动态gif泡泡 3、泡泡 4、静态验证码）'); -- ---------------------------- -- 18、代码生成业务表 @@ -673,7 +673,7 @@ create table gen_table ( drop table if exists gen_table_column; CREATE TABLE `gen_table_column` ( `columnId` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号', - `tableName` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '表名', + `tableName` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '表名', `tableId` bigint(20) NULL DEFAULT NULL COMMENT '归属表编号', `columnName` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '列名称', `columnComment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '列描述', diff --git a/document/admin-sqlserver-表字段说明导入.sql b/document/admin-sqlserver-表字段说明导入.sql new file mode 100644 index 0000000..f6784ae Binary files /dev/null and b/document/admin-sqlserver-表字段说明导入.sql differ diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql index bfd3bca..5487c3c 100644 Binary files a/document/admin-sqlserver.sql and b/document/admin-sqlserver.sql differ diff --git a/document/images/11.png b/document/images/11.png index 08ea386..828771e 100644 Binary files a/document/images/11.png and b/document/images/11.png differ diff --git a/document/images/12.png b/document/images/12.png index 88a55c0..06c4c1c 100644 Binary files a/document/images/12.png and b/document/images/12.png differ diff --git a/document/images/15-1.png b/document/images/15-1.png index 76fe704..d8aa996 100644 Binary files a/document/images/15-1.png and b/document/images/15-1.png differ diff --git a/document/images/15.png b/document/images/15.png index 668cd89..123fade 100644 Binary files a/document/images/15.png and b/document/images/15.png differ diff --git a/document/images/16.png b/document/images/16.png index 15af2c5..7895d07 100644 Binary files a/document/images/16.png and b/document/images/16.png differ diff --git a/document/images/17.png b/document/images/17.png index 3d416e6..c77cf17 100644 Binary files a/document/images/17.png and b/document/images/17.png differ