From fe40bbcafa4f2e403df60d4ce0c37d6a2a4fd80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=88=E3=83=BE=E9=AD=82?= <283591387@qq.com> Date: Sun, 9 Apr 2023 17:19:31 +0000 Subject: [PATCH 1/9] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 靈ヾ魂 <283591387@qq.com> --- README.md | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 7d0ce34f..d1eff2ce 100644 --- a/README.md +++ b/README.md @@ -40,76 +40,76 @@ - http://v2.volcore.xyz/app/guide ## 框架移动端（uniapp）已发布,同样全自动生成代码,扫描小程序二维码即可查看 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/qrcode.png) +![Home](/imgs/qrcode.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/app-01.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/app-02.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m001.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m002.png) +![Home](/imgs/app-01.png) +![Home](/imgs/app-02.png) +![Home](/imgs/m001.png) +![Home](/imgs/m002.png) ## 框架已支持Vue3版本 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/v3.png) +![Home](/imgs/v3.png) ## 框架已增加低代码设计器 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/fd01.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/fd02.png) +![Home](/imgs/fd01.png) +![Home](/imgs/fd02.png) ## 框架2.0已更新(部分新增功能截图) 增加切换皮肤功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/h.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/home_them.png) +![Home](/imgs/h.png) +![Home](/imgs/home_them.png) 增加可复用的后台请求参数校验 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/validator.png) +![Home](/imgs/validator.png) 增加树形菜单与代码生成页面使用 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/x7tree.png) +![Home](/imgs/x7tree.png) 增加文本编辑器直接发布静态页面功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/editor.png) +![Home](/imgs/editor.png) 一对一多从表显示(只需要少量代码就可完成成，其他都由代码生成器生成) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m1.png) +![Home](/imgs/m1.png) 表合并显示 (只需要几行代码完成代码生成器生成的页面实现扩展) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/span.png) +![Home](/imgs/span.png) 从图上传图片 (只需要几行代码完成代码生成器生成的页面实现扩展) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/p1.png) +![Home](/imgs/p1.png) 一对多从表(不限从表数量)扩展 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/multi.png) +![Home](/imgs/multi.png) 图表 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/charts.png) +![Home](/imgs/charts.png) ## 1、只读基础表单 整个只读的基础表单的所有前后端代码，全部由代码生成器生成，代码生成器中几乎不需要配置，并支持并后端业务代码扩展，直接生成代码后，配置菜单权限即可 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table1.png) +![Home](/imgs/table1.png) ## 2、自动绑定下拉框数据表单 整个自动绑定下拉框数据表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，在代码生成器中只需要指定数据源编号，页面加载时会根据编号自动加载数据源并绑定 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table2.png) +![Home](/imgs/table2.png) ## 3、启用图片支持、审核表单 整个启用图片支持、审核表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，审核功能需要在菜单配置权限、代码生成器中勾选启用图片支持 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table3.png) +![Home](/imgs/table3.png) ## 4、高级查询 整个表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，查询字段、类型(下拉框、日期、TextArea等)、所在行与列都由代码生成器完成，不需要写任何代码 - ![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/tablesearch4.png) + ![Home](/imgs/tablesearch4.png) ## 5、主从表新建、编辑 主从表新建、编辑所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，新建、编辑从表配置、字段、类型(下拉框、日期、TextArea等)、所在行与列、字段是否只读、标签显示的长度等都由代码生成器完成，不需要写任何代码 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/editTbale2.png) +![Home](/imgs/editTbale2.png) ## 6、excel导入 excel导入整个页面都由代码生成器生成，导入的字段、字段是否必填，下载模板也由代码生成器上配置(自己根据实际需要决定是否采用此方法)，导入时会验证是否为空与数据的合法性，逻辑校验自己实现扩展方法即可 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/importTable1.png) +![Home](/imgs/importTable1.png) ## 7、H5开发 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/h5.jpg) +![Home](/imgs/h5.jpg) ## 8、权限分配 目前只实现了对用户的角色的Action进行权限分配 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/auth.png) +![Home](/imgs/auth.png) ## 9、代码生成器 代码生成器提供了20多种可配置的属性，可灵活配置显示、查询、编辑、导入、导出、主从关系等功能点击看代码生成器文档 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/coder.png) +![Home](/imgs/coder.png) 其他功能。。。。。 -- Gitee From 3aaf2c593cd3148d3f4c8956ac3a69cb7153a573 Mon Sep 17 00:00:00 2001 From: vintom Date: Wed, 19 Apr 2023 14:08:39 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E6=8B=BC=E5=86=99=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../App_TransactionAvgPriceService.cs" | 4 +- .../Core/Partial/ISys_TableInfoService.cs" | 2 +- .../Core/Partial/Sys_TableInfoService.cs" | 58 +++---- .../VOL.Core/BaseProvider/IRepository.cs" | 2 +- .../VOL.Core/BaseProvider/RepositoryBase.cs" | 4 +- .../VOL.Core/BaseProvider/ServiceBase.cs" | 60 +++---- .../Service/MemoryCacheService .cs" | 6 +- .../Service/RedisCacheService.cs" | 4 +- .../Controllers/Basic/ApiBaseController.cs" | 5 +- .../VOL.Core/Dapper/ISqlDapper.cs" | 26 +-- .../VOL.Core/Dapper/SqlDapper.cs" | 72 ++++---- .../VOL.Core/EFDbContext/VOLContext.cs" | 4 +- .../VOL.Core/Enums/ApiStatutsCode.cs" | 2 +- .../VOL.Core/Enums/LoggerType.cs" | 4 +- .../VOL.Core/Enums/ResponseType.cs" | 2 +- .../VOL.Core/Extensions/EntityProperties.cs" | 163 +++++++++--------- .../VOL.Core/Extensions/GenericExtension.cs" | 4 +- .../Extensions/HtmlHelperViewExtensions.cs" | 4 +- .../VOL.Core/Extensions/LambdaExtensions.cs" | 8 +- .../VOL.Core/Extensions/RequestExtension.cs" | 6 +- .../Extensions/Response/ResponseMsg.cs" | 2 +- .../VOL.Core/Extensions/StringExtension.cs" | 30 ++-- .../Filters/ActionPermissionFilter.cs" | 2 +- .../VOL.Core/Filters/ApiAuthorizeFilter.cs" | 2 +- .../VOL.Core/Filters/FixedTokenAttribute.cs" | 14 +- .../VOL.Core/Filters/ServiceFunFilter.cs" | 6 +- .../Infrastructure/DictionaryHandler.cs" | 7 +- .../Infrastructure/DictionaryManager.cs" | 12 +- .../ExpressValidator/MethodsValidator.cs" | 2 +- .../VOL.Core/Quartz/HttpResultfulJob.cs" | 2 +- .../VOL.Core/Services/Logger.cs" | 16 +- .../VOL.Core/UserManager/RoleContext.cs" | 8 +- .../VOL.Core/UserManager/UserContext.cs" | 9 +- .../VOL.Core/Utilities/EPPlusHelper.cs" | 16 +- .../VOL.Core/Utilities/FileHelper.cs" | 52 +++--- .../VOL.Core/Utilities/JwtHelper.cs" | 2 +- .../VOL.Core/Utilities/VierificationCode.cs" | 4 +- .../Utilities/VierificationCodeHelpers.cs" | 2 +- .../Utilities/VierificationCodeServices.cs" | 4 +- .../VOL.Core/WorkFlow/WorkFlowManager.cs" | 36 ++-- .../VOL.Entity/DomainModels/App/test2019.cs" | 4 +- .../DomainModels/Quartz/Sys_QuartzLog.cs" | 2 +- .../DomainModels/System/Sys_User.cs" | 2 +- .../MappingConfiguration/MappingManager.cs" | 2 +- .../Sell/Partial/SellOrderService.cs" | 6 +- .../System/Partial/Sys_MenuService.cs" | 8 +- .../System/Partial/Sys_RoleService.cs" | 6 +- .../System/Partial/Sys_UserService.cs" | 2 +- .../Controllers/Builder/BuilderController.cs" | 4 +- .../Controllers/Hubs/HomePageMessageHub.cs" | 4 +- .../System/Partial/Sys_UserController.cs" | 14 +- .../DomainModel/ApiInputDomainModel.html" | 0 .../DomainModel/ApiOutputDomainModel.html" | 0 .../Template/DomainModel/DomainModel.html" | 0 .../DomainModel/MappingConfiguration.html" | 0 55 files changed, 360 insertions(+), 362 deletions(-) rename ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/ApiInputDomainModel.html" => ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/ApiInputDomainModel.html" (100%) rename ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/ApiOutputDomainModel.html" => ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/ApiOutputDomainModel.html" (100%) rename ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/DomainModel.html" => ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/DomainModel.html" (100%) rename ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/MappingConfiguration.html" => ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/MappingConfiguration.html" (100%) diff --git "a/.Net6\347\211\210\346\234\254/VOL.AppManager/Services/App/Partial/App_TransactionAvgPriceService.cs" "b/.Net6\347\211\210\346\234\254/VOL.AppManager/Services/App/Partial/App_TransactionAvgPriceService.cs" index c2529507..16042f5f 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.AppManager/Services/App/Partial/App_TransactionAvgPriceService.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.AppManager/Services/App/Partial/App_TransactionAvgPriceService.cs" @@ -32,9 +32,9 @@ namespace VOL.AppManager.Services return base.GetPageData(options); } - protected override object GetDetailSummary(IQueryable queryeable) + protected override object GetDetailSummary(IQueryable queryable) { - return base.GetDetailSummary(queryeable); + return base.GetDetailSummary(queryable); } } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Builder/IServices/Core/Partial/ISys_TableInfoService.cs" "b/.Net6\347\211\210\346\234\254/VOL.Builder/IServices/Core/Partial/ISys_TableInfoService.cs" index c77a18f5..b14cb021 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Builder/IServices/Core/Partial/ISys_TableInfoService.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Builder/IServices/Core/Partial/ISys_TableInfoService.cs" @@ -12,7 +12,7 @@ namespace VOL.Builder.IServices string CreateEntityModel(Sys_TableInfo tableInfo); - WebResponseContent SaveEidt(Sys_TableInfo sysTableInfo); + WebResponseContent SaveEdit(Sys_TableInfo sysTableInfo); string CreateServices(string tableName, string nameSpace, string foldername, bool webController, bool apiController); diff --git "a/.Net6\347\211\210\346\234\254/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs" "b/.Net6\347\211\210\346\234\254/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs" index 4bbe0e31..7df4dd8f 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs" @@ -30,7 +30,7 @@ namespace VOL.Builder.Services private string webProject = null; private string apiNameSpace = null; private string startName = ""; - private string StratName + private string StartName { get { @@ -322,7 +322,7 @@ DISTINCT /// /// /// - public WebResponseContent SaveEidt(Sys_TableInfo sysTableInfo) + public WebResponseContent SaveEdit(Sys_TableInfo sysTableInfo) { WebResponseContent webResponse = ValidColumnString(sysTableInfo); if (!webResponse.Status) return webResponse; @@ -485,22 +485,22 @@ DISTINCT if (!FileHelper.FileExists($"{apiPath}Partial\\{tableName}Controller.cs")) { string partialController = FileHelper.ReadFile(@"Template\\Controller\\ControllerApiPartial.html") - .Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName); + .Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StartName); FileHelper.WriteFile($"{apiPath}Partial\\", tableName + "Controller.cs", partialController); } //生成Api控制器 domainContent = FileHelper.ReadFile(@"Template\\Controller\\ControllerApi.html") - .Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName).Replace("{BaseOptions}", baseOptions); + .Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StartName).Replace("{BaseOptions}", baseOptions); FileHelper.WriteFile(apiPath, tableName + "Controller.cs", domainContent); } //生成Repository类 - domainContent = FileHelper.ReadFile("Template\\Repositorys\\BaseRepository.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName); + domainContent = FileHelper.ReadFile("Template\\Repositorys\\BaseRepository.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StartName); FileHelper.WriteFile( frameworkFolder + string.Format("\\{0}\\Repositories\\{1}\\", nameSpace, foldername) , tableName + "Repository.cs", domainContent); //生成IRepository类 - domainContent = FileHelper.ReadFile("Template\\IRepositorys\\BaseIRepositorie.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName); + domainContent = FileHelper.ReadFile("Template\\IRepositorys\\BaseIRepositorie.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StartName); FileHelper.WriteFile( frameworkFolder + string.Format("\\{0}\\IRepositories\\{1}\\", nameSpace, foldername), "I" + tableName + "Repository.cs", domainContent); @@ -513,29 +513,29 @@ DISTINCT //生成Partial IService类 if (!FileHelper.FileExists(path + "Partial\\" + fileName)) { - domainContent = FileHelper.ReadFile("Template\\IServices\\IServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName); + domainContent = FileHelper.ReadFile("Template\\IServices\\IServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StartName); FileHelper.WriteFile(path + "Partial\\", fileName, domainContent); } //生成IService类 - domainContent = FileHelper.ReadFile("Template\\IServices\\IServiceBase.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName); + domainContent = FileHelper.ReadFile("Template\\IServices\\IServiceBase.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StartName); FileHelper.WriteFile(path, fileName, domainContent); path = $"{frameworkFolder}\\{nameSpace}\\Services\\{ foldername}\\"; fileName = tableName + "Service.cs"; //生成Partial Service类 - domainContent = FileHelper.ReadFile("Template\\Services\\ServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName); + domainContent = FileHelper.ReadFile("Template\\Services\\ServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StartName); if (!FileHelper.FileExists(path + "Partial\\" + fileName)) { - domainContent = FileHelper.ReadFile("Template\\Services\\ServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName); + domainContent = FileHelper.ReadFile("Template\\Services\\ServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StartName); FileHelper.WriteFile(path + "Partial\\", fileName, domainContent); } //生成Service类 domainContent = FileHelper.ReadFile("Template\\Services\\ServiceBase.html") .Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName) - .Replace("{StartName}", StratName); + .Replace("{StartName}", StartName); FileHelper.WriteFile(path, fileName, domainContent); @@ -546,12 +546,12 @@ DISTINCT //生成Partial web控制器 if (!FileHelper.FileExists(path + "Partial\\" + fileName)) { - domainContent = FileHelper.ReadFile("Template\\Controller\\ControllerPartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{BaseOptions}", baseOptions).Replace("{StartName}", StratName); + domainContent = FileHelper.ReadFile("Template\\Controller\\ControllerPartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{BaseOptions}", baseOptions).Replace("{StartName}", StartName); FileHelper.WriteFile(path + "Partial\\", tableName + "Controller.cs", domainContent); } //生成web控制器 - domainContent = FileHelper.ReadFile("Template\\Controller\\Controller.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{BaseOptions}", baseOptions).Replace("{StartName}", StratName); + domainContent = FileHelper.ReadFile("Template\\Controller\\Controller.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{BaseOptions}", baseOptions).Replace("{StartName}", StartName); FileHelper.WriteFile(path, tableName + "Controller.cs", domainContent); } return "业务类创建成功!"; @@ -687,14 +687,14 @@ DISTINCT vuePath = vuePath.Trim().TrimEnd('/').TrimEnd('\\'); List sysColumnList = sysTableInfo.TableColumns; - string[] eidtTye = new string[] { "select", "selectList", "drop", "dropList", "checkbox" }; - if (sysColumnList.Exists(x => eidtTye.Contains(x.EditType) && string.IsNullOrEmpty(x.DropNo))) + string[] editTye = new string[] { "select", "selectList", "drop", "dropList", "checkbox" }; + if (sysColumnList.Exists(x => editTye.Contains(x.EditType) && string.IsNullOrEmpty(x.DropNo))) { - return $"编辑类型为[{string.Join(',', eidtTye)}]时必须选择数据源"; + return $"编辑类型为[{string.Join(',', editTye)}]时必须选择数据源"; } - if (sysColumnList.Exists(x => eidtTye.Contains(x.SearchType) && string.IsNullOrEmpty(x.DropNo))) + if (sysColumnList.Exists(x => editTye.Contains(x.SearchType) && string.IsNullOrEmpty(x.DropNo))) { - return $"查询类型为[{string.Join(',', eidtTye)}]时必须选择数据源"; + return $"查询类型为[{string.Join(',', editTye)}]时必须选择数据源"; } if (isApp && !sysColumnList.Exists(x => x.Enable > 0)) { @@ -718,7 +718,7 @@ DISTINCT { editFunc = x => new int[] { 1, 2, 5, 7 }.Any(c => c == x.Enable); } - var formFileds = sysColumnList.Where(editFunc) + var formFields = sysColumnList.Where(editFunc) .OrderBy(o => o.EditRowNo) .ThenByDescending(t => t.OrderNo) .Select(x => new KeyValuePair(x.ColumnName, x.EditType == "checkbox" || x.EditType == "selectList" || x.EditType == "cascader" ? new string[0] : "" as object)) @@ -762,12 +762,12 @@ DISTINCT { func = x => new int[] { 1, 3, 5, 6 }.Any(c => c == x.Enable); } - var searchFormFileds = sysColumnList.Where(func) + var searchFormFields = sysColumnList.Where(func) .Select(x => new KeyValuePair(x.ColumnName, x.SearchType == "checkbox" || x.SearchType == "selectList" || x.EditType == "cascader" ? new string[0] : x.SearchType == "range" ? new string[] { null, null } : "" as object)) .ToList().ToDictionary(x => x.Key, x => x.Value).Serialize(); - pageContent = pageContent.Replace("#searchFormFileds", searchFormFileds) + pageContent = pageContent.Replace("#searchFormFields", searchFormFields) .Replace("#searchFormOptions", list.Serialize() ?? "" .Replace("},{", "},\r\n {") .Replace("],[", "],\r\n [") @@ -786,7 +786,7 @@ DISTINCT Replace("#cnName", sysTableInfo.ColumnCNName). Replace("#url", "/" + sysTableInfo.TableName + "/"). Replace("#folder", spaceFolder). - Replace("#editFormFileds", formFileds). + Replace("#editFormFields", formFields). Replace("#editFormOptions", formOptions. Replace("},{", "},\r\n {"). Replace("],[", "],\r\n [")); @@ -1689,9 +1689,9 @@ DISTINCT { return "未找到生成的目录!"; } - string[] splitArrr = tableInfo.Namespace.Split('.'); + string[] splitArr = tableInfo.Namespace.Split('.'); // foldername = splitArrr.Length == 2 ? splitArrr[1] : foldername; - domainContent = domainContent.Replace("{TableName}", tableInfo.TableName).Replace("{AttributeList}", AttributeBuilder.ToString()).Replace("{StartName}", StratName); + domainContent = domainContent.Replace("{TableName}", tableInfo.TableName).Replace("{AttributeList}", AttributeBuilder.ToString()).Replace("{StartName}", StartName); // {AttributeManager} List entityAttribute = new List(); @@ -1729,7 +1729,7 @@ DISTINCT entityAttribute.Add("ApiOutput = typeof(Api" + tableInfo.TableName + "Output)"); } } - string modelNameSpace = StratName + ".Entity"; + string modelNameSpace = StartName + ".Entity"; string tableAttr = string.Join(",", entityAttribute); if (tableAttr != "") { @@ -1784,8 +1784,8 @@ DISTINCT if (createType == 1) { string mappingConfiguration = FileHelper. - ReadFile("Template\\DomianModel\\MappingConfiguration.html") - .Replace("{TableName}", tableInfo.TableName).Replace("{Namespace}", modelNameSpace).Replace("{StartName}", StratName); + ReadFile("Template\\DomainModel\\MappingConfiguration.html") + .Replace("{TableName}", tableInfo.TableName).Replace("{Namespace}", modelNameSpace).Replace("{StartName}", StartName); FileHelper.WriteFile( mapPath + string.Format("\\" + modelNameSpace + "\\MappingConfiguration\\{0}\\" @@ -1864,8 +1864,8 @@ DISTINCT predicate = x => arr.Any(c => c == x.Enable); } - var whereReslut = list.Where(predicate).OrderBy(orderBy).ThenByDescending(c => c.OrderNo).ToList(); - foreach (var item in whereReslut.GroupBy(keySelector)) + var whereResult = list.Where(predicate).OrderBy(orderBy).ThenByDescending(c => c.OrderNo).ToList(); + foreach (var item in whereResult.GroupBy(keySelector)) { panelHtml.Add(item.OrderBy(c => search ? c.SearchColNo : c.EditColNo).Select( x => new PanelHtml diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/IRepository.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/IRepository.cs" index 2e6b05ca..6d6fc966 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/IRepository.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/IRepository.cs" @@ -139,7 +139,7 @@ namespace VOL.Core.BaseProvider Task ExistsAsync(Expression> predicate) where TExists : class; - IIncludableQueryable Include(Expression> incluedProperty); + IIncludableQueryable Include(Expression> includeProperty); /// /// /// diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/RepositoryBase.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/RepositoryBase.cs" index e0913aa4..82ab1310 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/RepositoryBase.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/RepositoryBase.cs" @@ -216,9 +216,9 @@ namespace VOL.Core.BaseProvider return DbContext.Set().Where(predicate); } - public IIncludableQueryable Include(Expression> incluedProperty) + public IIncludableQueryable Include(Expression> includeProperty) { - return DbContext.Set().Include(incluedProperty); + return DbContext.Set().Include(includeProperty); } /// diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/ServiceBase.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/ServiceBase.cs" index 26835ed0..f6161505 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/ServiceBase.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/BaseProvider/ServiceBase.cs" @@ -349,7 +349,7 @@ namespace VOL.Core.BaseProvider .MakeGenericMethod(new Type[] { detailType }).Invoke(this, new object[] { pageData }); return obj; } - protected override object GetDetailSummary(IQueryable queryeable) + protected override object GetDetailSummary(IQueryable queryable) { return null; } @@ -365,18 +365,18 @@ namespace VOL.Core.BaseProvider //生成查询条件 Expression> whereExpression = keyName.CreateExpression(options.Value, LinqExpressionType.Equal); - var queryeable = repository.DbContext.Set().Where(whereExpression); + var queryable = repository.DbContext.Set().Where(whereExpression); - gridData.total = queryeable.Count(); + gridData.total = queryable.Count(); options.Sort = options.Sort ?? typeof(Detail).GetKeyName(); Dictionary orderBy = GetPageDataSort(options, typeof(Detail).GetProperties()); - gridData.rows = queryeable + gridData.rows = queryable .GetIQueryableOrderBy(orderBy) .Skip((options.Page - 1) * options.Rows) .Take(options.Rows) .ToList(); - gridData.summary = GetDetailSummary(queryeable); + gridData.summary = GetDetailSummary(queryable); return gridData; } @@ -543,9 +543,9 @@ namespace VOL.Core.BaseProvider saveDataModel.DetailData = saveDataModel.DetailData?.Where(x => x.Count > 0).ToList(); Type type = typeof(T); - string validReslut = type.ValidateDicInEntity(saveDataModel.MainData, true, UserIgnoreFields); + string validResult = type.ValidateDicInEntity(saveDataModel.MainData, true, UserIgnoreFields); - if (!string.IsNullOrEmpty(validReslut)) return Response.Error(validReslut); + if (!string.IsNullOrEmpty(validResult)) return Response.Error(validResult); if (saveDataModel.MainData.Count == 0) return Response.Error("保存的数据为空，请检查model是否配置正确!"); @@ -584,7 +584,7 @@ namespace VOL.Core.BaseProvider return Response; }); if (Response.Status) Response.Data = new { data = saveDataModel.MainData }; - AddProcese(mainEntity); + AddProcess(mainEntity); return Response; } @@ -660,7 +660,7 @@ namespace VOL.Core.BaseProvider { Response.OK(ResponseType.SaveSuccess); } - AddProcese(entity); + AddProcess(entity); return Response; } @@ -674,10 +674,10 @@ namespace VOL.Core.BaseProvider { return; } - var propertity = TProperties.Where(x => x.Name.ToLower() == "auditstatus").FirstOrDefault(); - if (propertity != null && propertity.GetValue(entity) == null) + var property = TProperties.Where(x => x.Name.ToLower() == "auditstatus").FirstOrDefault(); + if (property != null && property.GetValue(entity) == null) { - propertity.SetValue(entity, 0); + property.SetValue(entity, 0); } } /// @@ -688,9 +688,9 @@ namespace VOL.Core.BaseProvider /// 是否修改原表的审批状态 protected void RewriteFlow(T entity, bool changeTableStatus = true) { - WorkFlowManager.AddProcese(entity, true, changeTableStatus); + WorkFlowManager.AddProcess(entity, true, changeTableStatus); } - private void AddProcese(T entity) + private void AddProcess(T entity) { if (!CheckResponseResult() && WorkFlowManager.Exists()) { @@ -699,14 +699,14 @@ namespace VOL.Core.BaseProvider return; } //写入流程 - WorkFlowManager.AddProcese(entity); + WorkFlowManager.AddProcess(entity); WorkFlowManager.Audit(entity, AuditStatus.审核中, null, null, null, null, init: true, initInvoke: AddWorkFlowExecuted); } } public void AddDetailToDBSet() where TDetail : class { - List listChilds = TProperties.Where(x => x.PropertyType.Name == "List`1").ToList(); + List listChild = TProperties.Where(x => x.PropertyType.Name == "List`1").ToList(); // repository.DbContext.Set().AddRange(); } @@ -714,9 +714,9 @@ namespace VOL.Core.BaseProvider { T mainEntity = saveDataModel.MainData.DicToEntity(); //验证明细 - string reslut = typeof(TDetail).ValidateDicInEntity(saveDataModel.DetailData, true, false, new string[] { TProperties.GetKeyName() }); - if (reslut != string.Empty) - return Response.Error(reslut); + string result = typeof(TDetail).ValidateDicInEntity(saveDataModel.DetailData, true, false, new string[] { TProperties.GetKeyName() }); + if (result != string.Empty) + return Response.Error(result); List list = saveDataModel.DetailData.DicToList(); Response = Add(mainEntity, list, false); @@ -765,7 +765,7 @@ namespace VOL.Core.BaseProvider /// public WebResponseContent UpdateToEntity(SaveModel saveModel, PropertyInfo mainKeyProperty, PropertyInfo detailKeyInfo, object keyDefaultVal) where DetailT : class { - T mainEnity = saveModel.MainData.DicToEntity(); + T mainEntity = saveModel.MainData.DicToEntity(); List detailList = saveModel.DetailData.DicToList(); //2021.08.21优化明细表删除 //删除的主键 @@ -820,14 +820,14 @@ namespace VOL.Core.BaseProvider if (UpdateOnExecuting != null) { - Response = UpdateOnExecuting(mainEnity, addList, editList, delKeys); + Response = UpdateOnExecuting(mainEntity, addList, editList, delKeys); if (CheckResponseResult()) return Response; } - mainEnity.SetModifyDefaultVal(); + mainEntity.SetModifyDefaultVal(); //主表修改 //不修改!CreateFields.Contains创建人信息 - repository.Update(mainEnity, typeof(T).GetEditField() + repository.Update(mainEntity, typeof(T).GetEditField() .Where(c => saveModel.MainData.Keys.Contains(c) && !CreateFields.Contains(c)) .ToArray()); //foreach (var item in saveModel.DetailData) @@ -876,14 +876,14 @@ namespace VOL.Core.BaseProvider Response = repository.DbContextBeginTransaction(() => { repository.DbContext.SaveChanges(); - Response = UpdateOnExecuted(mainEnity, addList, editList, delKeys); + Response = UpdateOnExecuted(mainEntity, addList, editList, delKeys); return Response; }); } if (Response.Status) { addList.AddRange(editList); - Response.Data = new { data = mainEnity, list = addList }; + Response.Data = new { data = mainEntity, list = addList }; if (string.IsNullOrEmpty(Response.Message)) Response.OK(ResponseType.SaveSuccess); } @@ -1080,7 +1080,7 @@ namespace VOL.Core.BaseProvider // string detailKeyType = mainKeyProperty.GetTypeCustomValue(c => new { c.TypeName }); //判断明细是否包含了主表的主键 - string deatilDefaultVal = detailKeyInfo.PropertyType.Assembly.CreateInstance(detailKeyInfo.PropertyType.FullName).ToString(); + string detailDefaultVal = detailKeyInfo.PropertyType.Assembly.CreateInstance(detailKeyInfo.PropertyType.FullName).ToString(); foreach (Dictionary dic in saveModel.DetailData) { //不包含主键的默认添加主键默认值，用于后面判断是否为新增数据 @@ -1103,7 +1103,7 @@ namespace VOL.Core.BaseProvider //主键值是否正确 string detailKeyVal = dic[detailKeyInfo.Name].ToString(); if (!detailKeyInfo.ValidationValueForDbType(detailKeyVal).FirstOrDefault().Item1 - || deatilDefaultVal == detailKeyVal) + || detailDefaultVal == detailKeyVal) return Response.Error(ResponseType.KeyError); //判断主表的值是否正确 @@ -1258,7 +1258,7 @@ namespace VOL.Core.BaseProvider //表如果有审核相关字段，设置默认审核 - PropertyInfo[] updateFileds = TProperties.Where(x => auditFields.Contains(x.Name.ToLower())).ToArray(); + PropertyInfo[] updateFields = TProperties.Where(x => auditFields.Contains(x.Name.ToLower())).ToArray(); List auditList = new List(); foreach (var value in keys) { @@ -1267,7 +1267,7 @@ namespace VOL.Core.BaseProvider entity = Activator.CreateInstance(); property.SetValue(entity, convertVal); - foreach (var item in updateFileds) + foreach (var item in updateFields) { switch (item.Name.ToLower()) { @@ -1297,7 +1297,7 @@ namespace VOL.Core.BaseProvider } Response = repository.DbContextBeginTransaction(() => { - repository.UpdateRange(auditList, updateFileds.Select(x => x.Name).ToArray(), true); + repository.UpdateRange(auditList, updateFields.Select(x => x.Name).ToArray(), true); if (base.AuditOnExecuted != null) { Response = AuditOnExecuted(auditList); diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/CacheManager/Service/MemoryCacheService .cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/CacheManager/Service/MemoryCacheService .cs" index b3a67326..2ef13a24 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/CacheManager/Service/MemoryCacheService .cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/CacheManager/Service/MemoryCacheService .cs" @@ -92,14 +92,14 @@ namespace VOL.Core.CacheManager /// 缓存Key /// 缓存Value /// 滑动过期时长（如果在过期时间内有操作，则以当前时间点延长过期时间） - /// 绝对过期时长 + /// 绝对过期时长 /// - public bool Add(string key, object value, TimeSpan expiresSliding, TimeSpan expiressAbsoulte) + public bool Add(string key, object value, TimeSpan expiresSliding, TimeSpan expiresAbsolute) { _cache.Set(key, value, new MemoryCacheEntryOptions() .SetSlidingExpiration(expiresSliding) - .SetAbsoluteExpiration(expiressAbsoulte) + .SetAbsoluteExpiration(expiresAbsolute) ); return Exists(key); diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/CacheManager/Service/RedisCacheService.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/CacheManager/Service/RedisCacheService.cs" index 163175c0..c97851db 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/CacheManager/Service/RedisCacheService.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/CacheManager/Service/RedisCacheService.cs" @@ -13,8 +13,8 @@ namespace VOL.Core.CacheManager { public RedisCacheService() { - var csredis = new CSRedisClient(AppSetting.RedisConnectionString); - RedisHelper.Initialization(csredis); + var csRedis = new CSRedisClient(AppSetting.RedisConnectionString); + RedisHelper.Initialization(csRedis); } /// diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Controllers/Basic/ApiBaseController.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Controllers/Basic/ApiBaseController.cs" index adec0941..5f03315e 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Controllers/Basic/ApiBaseController.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Controllers/Basic/ApiBaseController.cs" @@ -36,12 +36,13 @@ namespace VOL.Core.Controllers.Basic /// /// /// + /// /// - protected JsonResult JsonNormal(object data, JsonSerializerSettings serializerSettings = null, bool formateDate = true) + protected JsonResult JsonNormal(object data, JsonSerializerSettings serializerSettings = null, bool formatDate = true) { serializerSettings = serializerSettings ?? new JsonSerializerSettings(); serializerSettings.ContractResolver = null; - if (formateDate) + if (formatDate) { serializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Dapper/ISqlDapper.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Dapper/ISqlDapper.cs" index b3856e39..539578d0 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Dapper/ISqlDapper.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Dapper/ISqlDapper.cs" @@ -15,7 +15,7 @@ namespace VOL.Core.Dapper /// /// /// - ISqlDapper SetTimout(int timeout); + ISqlDapper SetTimeout(int timeout); void BeginTransaction(Func action, Action error); List QueryList(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false); @@ -39,9 +39,9 @@ namespace VOL.Core.Dapper Task ExecuteScalarAsync(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false); - int ExcuteNonQuery(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false); + int ExecuteNonQuery(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false); - Task ExcuteNonQueryAsync(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false); + Task ExecuteNonQueryAsync(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false); //IDataReader ExecuteReader(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false); SqlMapper.GridReader QueryMultiple(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false); @@ -87,20 +87,20 @@ namespace VOL.Core.Dapper /// /// /// - /// - /// 指定插入的字段 + /// + /// 指定插入的字段 /// 是否开启事务 /// - int Add(T entity, Expression> updateFileds = null, bool beginTransaction = false); + int Add(T entity, Expression> updateFields = null, bool beginTransaction = false); /// /// /// /// /// - /// 指定插入的字段 + /// 指定插入的字段 /// 是否开启事务 /// - int AddRange(IEnumerable entities, Expression> updateFileds = null, bool beginTransaction = false); + int AddRange(IEnumerable entities, Expression> updateFields = null, bool beginTransaction = false); /// @@ -108,20 +108,20 @@ namespace VOL.Core.Dapper /// /// /// 实体必须带主键 - /// 指定更新的字段x=new {x.a,x.b} + /// 指定更新的字段x=new {x.a,x.b} /// 是否开启事务 /// - int Update(T entity, Expression> updateFileds = null, bool beginTransaction = false); + int Update(T entity, Expression> updateFields = null, bool beginTransaction = false); /// /// sqlserver使用的临时表参数化批量更新，mysql批量更新待发开 /// /// - /// 实体必须带主键 - /// 指定更新的字段x=new {x.a,x.b} + /// 实体必须带主键 + /// 指定更新的字段x=new {x.a,x.b} /// 是否开启事务 /// - int UpdateRange(IEnumerable entities, Expression> updateFileds = null, bool beginTransaction = false); + int UpdateRange(IEnumerable entities, Expression> updateFields = null, bool beginTransaction = false); /// /// 使用key批量删除 diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Dapper/SqlDapper.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Dapper/SqlDapper.cs" index 84369967..960ab561 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Dapper/SqlDapper.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Dapper/SqlDapper.cs" @@ -47,7 +47,7 @@ namespace VOL.Core.Dapper /// /// /// - public ISqlDapper SetTimout(int timeout) + public ISqlDapper SetTimeout(int timeout) { this.commandTimeout = timeout; return this; @@ -77,9 +77,9 @@ namespace VOL.Core.Dapper { _transactionConnection.Open(); dbTransaction = _transactionConnection.BeginTransaction(); - T reslutT = func(_transactionConnection, dbTransaction); + T resultT = func(_transactionConnection, dbTransaction); dbTransaction.Commit(); - return reslutT; + return resultT; } catch (Exception ex) { @@ -105,12 +105,12 @@ namespace VOL.Core.Dapper } using (var connection = DBServerProvider.GetDbConnection(_connectionString)) { - T reslutT = await funcAsync(connection, dbTransaction); + T resultT = await funcAsync(connection, dbTransaction); if (!_transaction && dbTransaction != null) { dbTransaction.Commit(); } - return reslutT; + return resultT; } } @@ -122,12 +122,12 @@ namespace VOL.Core.Dapper { connection.Open(); dbTransaction = connection.BeginTransaction(); - T reslutT = await funcAsync(connection, dbTransaction); + T resultT = await funcAsync(connection, dbTransaction); if (!_transaction && dbTransaction != null) { dbTransaction.Commit(); } - return reslutT; + return resultT; } catch (Exception ex) { @@ -266,7 +266,7 @@ namespace VOL.Core.Dapper }, beginTransaction); } - public async Task ExcuteNonQueryAsync(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false) + public async Task ExecuteNonQueryAsync(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false) { return await ExecuteAsync(async (conn, dbTransaction) => { @@ -274,7 +274,7 @@ namespace VOL.Core.Dapper }, beginTransaction); } - public int ExcuteNonQuery(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false) + public int ExecuteNonQuery(string cmd, object param, CommandType? commandType = null, bool beginTransaction = false) { return Execute((conn, dbTransaction) => { @@ -539,22 +539,22 @@ namespace VOL.Core.Dapper /// /// /// - /// 指定插入的字段 + /// 指定插入的字段 /// 是否开启事务 /// - public int Add(T entity, Expression> addFileds = null, bool beginTransaction = false) + public int Add(T entity, Expression> addFields = null, bool beginTransaction = false) { - return AddRange(new T[] { entity }, addFileds, beginTransaction); + return AddRange(new T[] { entity }, addFields, beginTransaction); } /// /// /// /// /// - /// 指定插入的字段 + /// 指定插入的字段 /// 是否开启事务 /// - public int AddRange(IEnumerable entities, Expression> addFileds = null, bool beginTransaction = true) + public int AddRange(IEnumerable entities, Expression> addFields = null, bool beginTransaction = true) { Type entityType = typeof(T); var key = entityType.GetKeyProperty(); @@ -565,9 +565,9 @@ namespace VOL.Core.Dapper string[] columns; //指定插入的字段 - if (addFileds != null) + if (addFields != null) { - columns = addFileds.GetExpressionToArray(); + columns = addFields.GetExpressionToArray(); } else { @@ -597,7 +597,7 @@ namespace VOL.Core.Dapper sql = $"insert into {entityType.GetEntityTableName()}({string.Join(",", columns)})" + $"select {string.Join(",", columns)} from {EntityToSqlTempName.TempInsert};"; //2020.11.21修复sqlserver批量写入主键类型判断错误 - sql = entities.GetEntitySql(key.PropertyType == typeof(Guid), sql, null, addFileds, null); + sql = entities.GetEntitySql(key.PropertyType == typeof(Guid), sql, null, addFields, null); } return Execute((conn, dbTransaction) => { @@ -612,12 +612,12 @@ namespace VOL.Core.Dapper /// /// /// 实体必须带主键 - /// 指定更新的字段x=new {x.a,x.b} + /// 指定更新的字段x=new {x.a,x.b} /// 是否开启事务 /// - public int Update(T entity, Expression> updateFileds = null, bool beginTransaction = false) + public int Update(T entity, Expression> updateFields = null, bool beginTransaction = false) { - return UpdateRange(new T[] { entity }, updateFileds, beginTransaction); + return UpdateRange(new T[] { entity }, updateFields, beginTransaction); } /// @@ -625,10 +625,10 @@ namespace VOL.Core.Dapper /// /// /// 实体必须带主键 - /// 批定更新字段 + /// 批定更新字段 /// /// - public int UpdateRange(IEnumerable entities, Expression> updateFileds = null, bool beginTransaction = false) + public int UpdateRange(IEnumerable entities, Expression> updateFields = null, bool beginTransaction = false) { Type entityType = typeof(T); var key = entityType.GetKeyProperty(); @@ -639,9 +639,9 @@ namespace VOL.Core.Dapper var properties = entityType.GetGenericProperties() .Where(x => x.Name != key.Name); - if (updateFileds != null) + if (updateFields != null) { - properties = properties.Where(x => updateFileds.GetExpressionToArray().Contains(x.Name)); + properties = properties.Where(x => updateFields.GetExpressionToArray().Contains(x.Name)); } if (DBType.Name == DbCurrentType.MySql.ToString()) @@ -653,13 +653,13 @@ namespace VOL.Core.Dapper } string sqltext = $@"UPDATE { entityType.GetEntityTableName()} SET {string.Join(",", paramsList)} WHERE {entityType.GetKeyName()} = @{entityType.GetKeyName()} ;"; - return ExcuteNonQuery(sqltext, entities, CommandType.Text, beginTransaction); + return ExecuteNonQuery(sqltext, entities, CommandType.Text, beginTransaction); // throw new Exception("mysql批量更新未实现"); } string fileds = string.Join(",", properties.Select(x => $" a.{x.Name}=b.{x.Name}").ToArray()); string sql = $"update a set {fileds} from {entityType.GetEntityTableName()} as a inner join {EntityToSqlTempName.TempInsert.ToString()} as b on a.{key.Name}=b.{key.Name}"; - sql = entities.ToList().GetEntitySql(true, sql, null, updateFileds, null); - return ExcuteNonQuery(sql, null, CommandType.Text, beginTransaction); + sql = entities.ToList().GetEntitySql(true, sql, null, updateFields, null); + return ExecuteNonQuery(sql, null, CommandType.Text, beginTransaction); } @@ -677,7 +677,7 @@ namespace VOL.Core.Dapper Type entityType = typeof(T); var keyProperty = entityType.GetKeyProperty(); string sql = $"DELETE FROM {entityType.GetEntityTableName() } where {keyProperty.Name} in @keys "; - return ExcuteNonQuery(sql, new { keys }).GetInt(); + return ExecuteNonQuery(sql, new { keys }).GetInt(); } /// /// 通过Bulk批量插入 @@ -772,7 +772,7 @@ namespace VOL.Core.Dapper { stream = new MemoryStream(array); bulk.SourceStream = stream; //File.OpenRead(fileName); - bulk.Columns.AddRange(table.Columns.Cast().Select(colum => colum.ColumnName).ToList()); + bulk.Columns.AddRange(table.Columns.Cast().Select(column => column.ColumnName).ToList()); insertCount = bulk.Load(); tran.Commit(); } @@ -798,7 +798,7 @@ namespace VOL.Core.Dapper //列内容如存在半角逗号（即,）则用半角引号（即""）将该字段值包含起来。 //列内容如存在半角引号（即"）则应替换成半角双引号（""）转义，并用半角引号（即""）将该字段值包含起来。 StringBuilder sb = new StringBuilder(); - DataColumn colum; + DataColumn column; Type typeString = typeof(string); Type typeDate = typeof(DateTime); @@ -806,20 +806,20 @@ namespace VOL.Core.Dapper { for (int i = 0; i < table.Columns.Count; i++) { - colum = table.Columns[i]; + column = table.Columns[i]; if (i != 0) sb.Append("\t"); - if (colum.DataType == typeString) + if (column.DataType == typeString) { - var data = $"\"{row[colum].ToString().Replace("\"", "\"\"")}\""; + var data = $"\"{row[column].ToString().Replace("\"", "\"\"")}\""; sb.Append(data); } - else if (colum.DataType == typeDate) + else if (column.DataType == typeDate) { //centos系统里把datatable里的日期转换成了10/18/18 3:26:15 PM格式 - bool b = DateTime.TryParse(row[colum].ToString(), out DateTime dt); + bool b = DateTime.TryParse(row[column].ToString(), out DateTime dt); sb.Append(b ? dt.ToString("yyyy-MM-dd HH:mm:ss") : ""); } - else sb.Append(row[colum].ToString()); + else sb.Append(row[column].ToString()); } sb.Append("\n"); } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/EFDbContext/VOLContext.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/EFDbContext/VOLContext.cs" index 779b3188..22dc1d7f 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/EFDbContext/VOLContext.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/EFDbContext/VOLContext.cs" @@ -22,10 +22,10 @@ namespace VOL.Core.EFDbContext : base() { } - public VOLContext(string connction) + public VOLContext(string connection) : base() { - DataBaseName = connction; + DataBaseName = connection; } public VOLContext(DbContextOptions options) diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Enums/ApiStatutsCode.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Enums/ApiStatutsCode.cs" index b16fe4cb..53a92abb 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Enums/ApiStatutsCode.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Enums/ApiStatutsCode.cs" @@ -4,7 +4,7 @@ using System.Text; namespace VOL.Core.Enums { - public enum ApiStatutsCode + public enum ApiStatusCode { False = 0, Ok = 1, diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Enums/LoggerType.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Enums/LoggerType.cs" index c9ebd9a4..192ff95e 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Enums/LoggerType.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Enums/LoggerType.cs" @@ -10,7 +10,7 @@ namespace VOL.Core.Enums Info, Success, Error, - Authorzie, + Authorize, Global, Login, Exception, @@ -48,7 +48,7 @@ namespace VOL.Core.Enums ExpertAuthority, ParEmpty, NoToken, - ReplaceToeken, + ReplaceToken, KafkaException } } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Enums/ResponseType.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Enums/ResponseType.cs" index aa5ea5b2..f787ad04 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Enums/ResponseType.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Enums/ResponseType.cs" @@ -21,7 +21,7 @@ namespace VOL.Core.Enums OperSuccess, RegisterSuccess, ModifyPwdSuccess, - EidtSuccess, + EditSuccess, DelSuccess, NoKey, NoKeyDel, diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/EntityProperties.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/EntityProperties.cs" index d4667cd2..d70f3ed7 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/EntityProperties.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/EntityProperties.cs" @@ -111,7 +111,7 @@ namespace VOL.Core.Extensions /// /// /// - public static List GetAtrrNames(this Type typeinfo) + public static List GetAttrNames(this Type typeinfo) { return typeinfo.GetProperties().Select(c => c.Name).ToList(); } @@ -119,11 +119,11 @@ namespace VOL.Core.Extensions { } - public static Dictionary GetColumType(this PropertyInfo[] properties) + public static Dictionary GetColumnType(this PropertyInfo[] properties) { - return properties.GetColumType(false); + return properties.GetColumnType(false); } - public static Dictionary GetColumType(this PropertyInfo[] properties, bool containsKey) + public static Dictionary GetColumnType(this PropertyInfo[] properties, bool containsKey) { Dictionary dictionary = new Dictionary(); foreach (PropertyInfo property in properties) @@ -159,36 +159,36 @@ namespace VOL.Core.Extensions /// 返回属性的字段及数据库类型 /// /// - /// 是否包括后字段具体长度:nvarchar(100) + /// 是否包括后字段具体长度:nvarchar(100) /// - public static KeyValuePair GetColumnType(this PropertyInfo property, bool lenght = false) + public static KeyValuePair GetColumnType(this PropertyInfo property, bool includeLength = false) { string colType = ""; - object objAtrr = property.GetTypeCustomAttributes(typeof(ColumnAttribute), out bool asType); + object objAttr = property.GetTypeCustomAttributes(typeof(ColumnAttribute), out bool asType); if (asType) { - colType = ((ColumnAttribute)objAtrr).TypeName.ToLower(); + colType = ((ColumnAttribute)objAttr).TypeName.ToLower(); if (!string.IsNullOrEmpty(colType)) { //不需要具体长度直接返回 - if (!lenght) + if (!includeLength) { return new KeyValuePair(property.Name, colType); } if (colType == "decimal" || colType == "double" || colType == "float") { - objAtrr = property.GetTypeCustomAttributes(typeof(DisplayFormatAttribute), out asType); - colType += "(" + (asType ? ((DisplayFormatAttribute)objAtrr).DataFormatString : "18,5") + ")"; + objAttr = property.GetTypeCustomAttributes(typeof(DisplayFormatAttribute), out asType); + colType += "(" + (asType ? ((DisplayFormatAttribute)objAttr).DataFormatString : "18,5") + ")"; } ///如果是string,根据 varchar或nvarchar判断最大长度 if (property.PropertyType.ToString() == "System.String") { colType = colType.Split("(")[0]; - objAtrr = property.GetTypeCustomAttributes(typeof(MaxLengthAttribute), out asType); + objAttr = property.GetTypeCustomAttributes(typeof(MaxLengthAttribute), out asType); if (asType) { - int length = ((MaxLengthAttribute)objAtrr).Length; + int length = ((MaxLengthAttribute)objAttr).Length; colType += "(" + (length < 1 || length > (colType.StartsWith("n") ? 8000 : 4000) ? "max" : length.ToString()) + ")"; } else @@ -207,7 +207,7 @@ namespace VOL.Core.Extensions { colType = SqlDbTypeName.NVarChar; } - if (lenght && colType == SqlDbTypeName.NVarChar) + if (includeLength && colType == SqlDbTypeName.NVarChar) { colType = "nvarchar(max)"; } @@ -219,7 +219,6 @@ namespace VOL.Core.Extensions /// /// 将数组转换成sql语句 /// 指定FieldType数据库字段类型 - /// /// public static string GetArraySql(this object[] array, FieldType fieldType) { @@ -228,8 +227,8 @@ namespace VOL.Core.Extensions return string.Empty; } string columnType = string.Empty; - List arrrayEntityList = array.Select(x => new ArrayEntity { column1 = x.ToString() }).ToList(); - return arrrayEntityList.GetEntitySql(false, null, null, null, fieldType); + List arrayEntityList = array.Select(x => new ArrayEntity { column1 = x.ToString() }).ToList(); + return arrayEntityList.GetEntitySql(false, null, null, null, fieldType); } /// ///要执行的sql语句如：通过EntityToSqlTempName.Temp_Insert0.ToString()字符串占位，生成的的sql语句会把EntityToSqlTempName.Temp_Insert0.ToString()替换成生成的sql临时表数据 @@ -248,8 +247,8 @@ namespace VOL.Core.Extensions return string.Empty; } string columnType = string.Empty; - List arrrayEntityList = array.Select(x => new ArrayEntity { column1 = x.ToString() }).ToList(); - return arrrayEntityList.GetEntitySql(false, sql, null, null, fieldType); + List arrayEntityList = array.Select(x => new ArrayEntity { column1 = x.ToString() }).ToList(); + return arrayEntityList.GetEntitySql(false, sql, null, null, fieldType); } public static string GetArraySql(this object[] array, string sql) { @@ -277,7 +276,7 @@ namespace VOL.Core.Extensions public static string GetEntitySql(this IEnumerable entityList, bool containsKey = false, string sql = null, - Expression> ignoreFileds = null, + Expression> ignoreFields = null, Expression> fixedColumns = null, FieldType? fieldType = null ) @@ -298,13 +297,13 @@ namespace VOL.Core.Extensions PropertyInfo keyProperty = typeof(T).GetKeyProperty(); propertyInfo = propertyInfo.Where(x => (containsKey && x.Name == keyProperty.Name) || arr.Contains(x.Name)).ToArray(); } - if (ignoreFileds != null) + if (ignoreFields != null) { - arr = ignoreFileds.GetExpressionToArray(); + arr = ignoreFields.GetExpressionToArray(); propertyInfo = propertyInfo.Where(x => !arr.Contains(x.Name)).ToArray(); } - Dictionary dictProperties = propertyInfo.GetColumType(containsKey); + Dictionary dictProperties = propertyInfo.GetColumnType(containsKey); if (fieldType != null) { string realType = fieldType.ToString(); @@ -322,9 +321,9 @@ namespace VOL.Core.Extensions string cols = string.Join(",", dictProperties.Select(c => "[" + c.Key + "]" + " " + c.Value)); StringBuilder declareTable = new StringBuilder(); - string tempTablbe = "#" + EntityToSqlTempName.TempInsert.ToString(); + string tempTable = "#" + EntityToSqlTempName.TempInsert.ToString(); - declareTable.Append("CREATE TABLE " + tempTablbe + " (" + cols + ")"); + declareTable.Append("CREATE TABLE " + tempTable + " (" + cols + ")"); declareTable.Append("\r\n"); //参数总数量 @@ -363,7 +362,7 @@ namespace VOL.Core.Extensions index = 0; count = 0; } - stringLeft.Append(index == 0 ? "; INSERT INTO " + tempTablbe + " values (" : " "); + stringLeft.Append(index == 0 ? "; INSERT INTO " + tempTable + " values (" : " "); index++; foreach (PropertyInfo property in propertyInfo) { @@ -397,18 +396,18 @@ namespace VOL.Core.Extensions } if (!string.IsNullOrEmpty(sql)) { - sql = sql.Replace(EntityToSqlTempName.TempInsert.ToString(), tempTablbe); + sql = sql.Replace(EntityToSqlTempName.TempInsert.ToString(), tempTable); declareTable.AppendLine(sql); } else { - declareTable.AppendLine(" SELECT " + (string.Join(",", fixedColumns?.GetExpressionToArray() ?? new string[] { "*" })) + " FROM " + tempTablbe); + declareTable.AppendLine(" SELECT " + (string.Join(",", fixedColumns?.GetExpressionToArray() ?? new string[] { "*" })) + " FROM " + tempTable); } - if (tempTablbe.Substring(0, 1) == "#") + if (tempTable.Substring(0, 1) == "#") { - declareTable.AppendLine("; drop table " + tempTablbe); + declareTable.AppendLine("; drop table " + tempTable); } return declareTable.ToString(); } @@ -423,33 +422,33 @@ namespace VOL.Core.Extensions /// public static string GetDataTableSql(this DataTable table) { - Dictionary dictCloumn = new Dictionary(); + Dictionary dictColumn = new Dictionary(); for (int i = 0; i < table.Columns.Count; i++) { - dictCloumn.Add(table.Columns[i].ColumnName, " nvarchar(max)"); + dictColumn.Add(table.Columns[i].ColumnName, " nvarchar(max)"); } //参数总数量 - int parCount = (dictCloumn.Count) * (table.Rows.Count); + int parCount = (dictColumn.Count) * (table.Rows.Count); int takeCount = 0; int maxParsCount = 2050; if (parCount > maxParsCount) { //如果参数总数量超过2100，设置每次分批循环写入表的大小 - takeCount = maxParsCount / dictCloumn.Count; + takeCount = maxParsCount / dictColumn.Count; } - if (dictCloumn.Keys.Count * table.Rows.Count > 50 * 3000) + if (dictColumn.Keys.Count * table.Rows.Count > 50 * 3000) { throw new Exception("写入数据太多,请分开写入。"); } - string cols = string.Join(",", dictCloumn.Select(c => "[" + c.Key + "]" + " " + c.Value)); + string cols = string.Join(",", dictColumn.Select(c => "[" + c.Key + "]" + " " + c.Value)); StringBuilder declareTable = new StringBuilder(); - string tempTablbe = "#Temp_Insert0"; - declareTable.Append("CREATE TABLE " + tempTablbe + " (" + cols + ")"); + string tempTable = "#Temp_Insert0"; + declareTable.Append("CREATE TABLE " + tempTable + " (" + cols + ")"); declareTable.Append("\r\n"); int count = 0; StringBuilder stringLeft = new StringBuilder(); @@ -478,9 +477,9 @@ namespace VOL.Core.Extensions index = 0; count = 0; } - stringLeft.Append(index == 0 ? "; INSERT INTO " + tempTablbe + " values (" : " "); + stringLeft.Append(index == 0 ? "; INSERT INTO " + tempTable + " values (" : " "); index++; - foreach (KeyValuePair keyValue in dictCloumn) + foreach (KeyValuePair keyValue in dictColumn) { string par = "@v" + count; stringLeft.Append(par + ","); @@ -513,10 +512,10 @@ namespace VOL.Core.Extensions stringLeft.Clear(); stringCenter.Clear(); stringRight.Clear(); } - declareTable.AppendLine(" SELECT * FROM " + tempTablbe); - if (tempTablbe.Substring(0, 1) == "#") + declareTable.AppendLine(" SELECT * FROM " + tempTable); + if (tempTable.Substring(0, 1) == "#") { - declareTable.AppendLine("; drop table " + tempTablbe); + declareTable.AppendLine("; drop table " + tempTable); } return declareTable.ToString(); } @@ -567,7 +566,7 @@ namespace VOL.Core.Extensions if (attributes.Length > 0) return ((ColumnAttribute)attributes[0]).TypeName.ToLower(); else - return GetColumType(new PropertyInfo[] { propertyInfo }, true)[propertyInfo.Name]; + return GetColumnType(new PropertyInfo[] { propertyInfo }, true)[propertyInfo.Name]; } return keyName; } @@ -749,11 +748,11 @@ namespace VOL.Core.Extensions } } //若存在specificProperties并且属性为数组specificProperties中的值，校验时就需要判断是否为空 - var reslut = propertyInfo.ValidationProperty(value, + var result = propertyInfo.ValidationProperty(value, specificProperties != null && specificProperties.Contains(propertyInfo.Name) ? true : false ); - if (!reslut.Item1) - return responseData.Error(reslut.Item2); + if (!result.Item1) + return responseData.Error(result.Item2); } return responseData.OK(); } @@ -810,7 +809,7 @@ namespace VOL.Core.Extensions } } - public static bool ValidationRquiredValueForDbType(this PropertyInfo propertyInfo, object value, out string message) + public static bool ValidationRequiredValueForDbType(this PropertyInfo propertyInfo, object value, out string message) { if (value == null || value?.ToString()?.Trim() == "") { @@ -859,17 +858,17 @@ namespace VOL.Core.Extensions dbType = dbType.ToLower(); string val = value?.ToString(); //验证长度 - string reslutMsg = string.Empty; + string resultMsg = string.Empty; if (dbType == SqlDbTypeName.Int) { if (!value.IsInt()) - reslutMsg = "只能为有效整数"; + resultMsg = "只能为有效整数"; } //2021.10.12增加属性校验long类型的支持 else if (dbType == SqlDbTypeName.BigInt) { if (!long.TryParse(val, out _)) { - reslutMsg = "只能为有效整数"; + resultMsg = "只能为有效整数"; } } else if (dbType == SqlDbTypeName.DateTime @@ -879,7 +878,7 @@ namespace VOL.Core.Extensions ) { if (!value.IsDate()) - reslutMsg = "必须为日期格式"; + resultMsg = "必须为日期格式"; } else if (dbType == SqlDbTypeName.Float || dbType == SqlDbTypeName.Decimal || dbType == SqlDbTypeName.Double) { @@ -893,14 +892,14 @@ namespace VOL.Core.Extensions { // string[] arr = (formatString ?? "10,0").Split(','); // reslutMsg = $"整数{arr[0]}最多位,小数最多{arr[1]}位"; - reslutMsg = "不是有效数字"; + resultMsg = "不是有效数字"; } } else if (dbType == SqlDbTypeName.UniqueIdentifier) { if (!val.IsGuid()) { - reslutMsg = propertyInfo.Name + "Guid不正确"; + resultMsg = propertyInfo.Name + "Guid不正确"; } } else if (propertyInfo != null @@ -914,7 +913,7 @@ namespace VOL.Core.Extensions //默认nvarchar(max) 、text 长度不能超过20000 if (val.Length > 200000) { - reslutMsg = $"字符长度最多【200000】"; + resultMsg = $"字符长度最多【200000】"; } else { @@ -927,15 +926,15 @@ namespace VOL.Core.Extensions || val.Length > length) ) { - reslutMsg = $"最多只能【{length}】个字符。"; + resultMsg = $"最多只能【{length}】个字符。"; } } } - if (!string.IsNullOrEmpty(reslutMsg) && propertyInfo != null) + if (!string.IsNullOrEmpty(resultMsg) && propertyInfo != null) { - reslutMsg = propertyInfo.GetDisplayName() + reslutMsg; + resultMsg = propertyInfo.GetDisplayName() + resultMsg; } - return (reslutMsg == "" ? true : false, reslutMsg, value); + return (resultMsg == "" ? true : false, resultMsg, value); } public static string GetDisplayName(this PropertyInfo property) @@ -964,11 +963,11 @@ namespace VOL.Core.Extensions string requiredMsg = string.Empty; if (!required) { - var reuireVal = propertyInfo.GetTypeCustomValues(x => new { x.AllowEmptyStrings, x.ErrorMessage }); - if (reuireVal != null && !Convert.ToBoolean(reuireVal["AllowEmptyStrings"])) + var requireVal = propertyInfo.GetTypeCustomValues(x => new { x.AllowEmptyStrings, x.ErrorMessage }); + if (requireVal != null && !Convert.ToBoolean(requireVal["AllowEmptyStrings"])) { required = true; - requiredMsg = reuireVal["ErrorMessage"]; + requiredMsg = requireVal["ErrorMessage"]; } } //如果不要求为必填项并且值为空，直接返回 @@ -1073,14 +1072,14 @@ namespace VOL.Core.Extensions public static string ValidateDicInEntity(this Type type, List> dicList, bool removeNotContains, bool removerKey, string[] ignoreFields = null) { PropertyInfo[] propertyInfo = type.GetProperties(); - string reslutMsg = string.Empty; + string resultMsg = string.Empty; foreach (Dictionary dic in dicList) { - reslutMsg = type.ValidateDicInEntity(dic, propertyInfo, removeNotContains, removerKey, ignoreFields); - if (!string.IsNullOrEmpty(reslutMsg)) - return reslutMsg; + resultMsg = type.ValidateDicInEntity(dic, propertyInfo, removeNotContains, removerKey, ignoreFields); + if (!string.IsNullOrEmpty(resultMsg)) + return resultMsg; } - return reslutMsg; + return resultMsg; } public static string ValidateDicInEntity(this Type type, Dictionary dic, bool removeNotContains, bool removerKey, string[] ignoreFields = null) { @@ -1232,19 +1231,19 @@ namespace VOL.Core.Extensions // return outPutObject; //} - private static object MapToInstance(this Type reslutType, object sourceEntity, PropertyInfo[] sourcePro, PropertyInfo[] reslutPro, string[] sourceFilterField, string[] reslutFilterField, string mapType = null) + private static object MapToInstance(this Type resultType, object sourceEntity, PropertyInfo[] sourcePro, PropertyInfo[] resultPro, string[] sourceFilterField, string[] reslutFilterField, string mapType = null) { - mapType = mapType ?? GetMapType(reslutType); + mapType = mapType ?? GetMapType(resultType); if (sourcePro == null) { sourcePro = sourceEntity.GetType().GetProperties(); } - if (reslutPro == null) + if (resultPro == null) { - reslutPro = reslutType.GetProperties(); ; + resultPro = resultType.GetProperties(); ; } - object newObj = Activator.CreateInstance(reslutType); + object newObj = Activator.CreateInstance(resultType); if (mapType == "Dictionary") { @@ -1261,10 +1260,10 @@ namespace VOL.Core.Extensions if (reslutFilterField != null && reslutFilterField.Count() > 0) { - reslutPro.Where(x => reslutFilterField.Contains(x.Name)); + resultPro.Where(x => reslutFilterField.Contains(x.Name)); } - foreach (var property in reslutPro) + foreach (var property in resultPro) { PropertyInfo info = sourcePro.Where(x => x.Name == property.Name).FirstOrDefault(); if (!(info != null && info.PropertyType == property.PropertyType)) @@ -1295,9 +1294,9 @@ namespace VOL.Core.Extensions if (source == null) return null; string[] sourceFilterField = sourceExpression == null ? typeof(TSource).GetProperties().Select(x => x.Name).ToArray() : sourceExpression.GetExpressionProperty(); - string[] reslutFilterField = resultExpression?.GetExpressionProperty(); + string[] resultFilterField = resultExpression?.GetExpressionProperty(); if (!(source is System.Collections.IList)) - return MapToInstance(typeof(TResult), source, null, null, sourceFilterField, reslutFilterField) as TResult; + return MapToInstance(typeof(TResult), source, null, null, sourceFilterField, resultFilterField) as TResult; Type sourceType = null; Type resultType = null; @@ -1305,17 +1304,17 @@ namespace VOL.Core.Extensions sourceType = sourceList[0].GetType(); resultType = (typeof(TResult)).GenericTypeArguments[0]; - System.Collections.IList reslutList = Activator.CreateInstance(typeof(TResult)) as System.Collections.IList; + System.Collections.IList resultList = Activator.CreateInstance(typeof(TResult)) as System.Collections.IList; PropertyInfo[] sourcePro = sourceType.GetProperties(); PropertyInfo[] resultPro = resultType.GetProperties(); string mapType = GetMapType(resultType); for (int i = 0; i < sourceList.Count; i++) { - var reslutobj = MapToInstance(resultType, sourceList[i], sourcePro, resultPro, sourceFilterField, reslutFilterField, mapType); - reslutList.Add(reslutobj); + var resultObj = MapToInstance(resultType, sourceList[i], sourcePro, resultPro, sourceFilterField, resultFilterField, mapType); + resultList.Add(resultObj); } - return reslutList as TResult; + return resultList as TResult; } /// @@ -1332,9 +1331,9 @@ namespace VOL.Core.Extensions if (source == null) return; string[] fields = expression?.GetExpressionToArray(); - PropertyInfo[] reslutPro = fields == null ? result.GetType().GetProperties() : result.GetType().GetProperties().Where(x => fields.Contains(x.Name)).ToArray(); + PropertyInfo[] resultPro = fields == null ? result.GetType().GetProperties() : result.GetType().GetProperties().Where(x => fields.Contains(x.Name)).ToArray(); PropertyInfo[] sourcePro = source.GetType().GetProperties(); - foreach (var property in reslutPro) + foreach (var property in resultPro) { PropertyInfo info = sourcePro.Where(x => x.Name == property.Name).FirstOrDefault(); if (info != null && info.PropertyType == property.PropertyType) diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/GenericExtension.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/GenericExtension.cs" index bd5744b4..bb68ce7d 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/GenericExtension.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/GenericExtension.cs" @@ -57,7 +57,7 @@ namespace VOL.Core.Extensions #endregion - public static DataTable ToDataTable(this IEnumerable source, Expression> columns = null, bool contianKey = true) + public static DataTable ToDataTable(this IEnumerable source, Expression> columns = null, bool containKey = true) { DataTable dtReturn = new DataTable(); if (source == null) return dtReturn; @@ -71,7 +71,7 @@ namespace VOL.Core.Extensions } //移除自增主键 PropertyInfo keyType = oProps.GetKeyProperty();// oProps.GetKeyProperty()?.PropertyType; - if (!contianKey && keyType != null && (keyType.PropertyType == typeof(int) || keyType.PropertyType == typeof(long))) + if (!containKey && keyType != null && (keyType.PropertyType == typeof(int) || keyType.PropertyType == typeof(long))) { oProps = oProps.Where(x => x.Name != keyType.Name).ToArray(); } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/HtmlHelperViewExtensions.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/HtmlHelperViewExtensions.cs" index 868c40ea..7caedad4 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/HtmlHelperViewExtensions.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/HtmlHelperViewExtensions.cs" @@ -66,7 +66,7 @@ namespace VOL.Core.Extensions var actionDescriptor = actionSelector.SelectBestCandidate(routeContext, candidates); var originalActionContext = actionContextAccessor.ActionContext; - var originalhttpContext = httpContextAccessor.HttpContext; + var originalHttpContext = httpContextAccessor.HttpContext; try { var newHttpContext = serviceProvider.GetRequiredService().Create(helper.ViewContext.HttpContext.Features); @@ -92,7 +92,7 @@ namespace VOL.Core.Extensions finally { actionContextAccessor.ActionContext = originalActionContext; - httpContextAccessor.HttpContext = originalhttpContext; + httpContextAccessor.HttpContext = originalHttpContext; if (helper.ViewContext.HttpContext.Items.ContainsKey(typeof(IUrlHelper))) { helper.ViewContext.HttpContext.Items.Remove(typeof(IUrlHelper)); diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/LambdaExtensions.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/LambdaExtensions.cs" index ba49d86b..c2e110e6 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/LambdaExtensions.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/LambdaExtensions.cs" @@ -429,7 +429,7 @@ namespace VOL.Core.Extensions // build parameter map (from parameters of second to parameters of first) var map = first.Parameters.Select((f, i) => new { f, s = second.Parameters[i] }).ToDictionary(p => p.s, p => p.f); // replace parameters in the second lambda expression with parameters from the first - var secondBody = ParameterRebinder.ReplaceParameters(map, second.Body); + var secondBody = ParameterRebind.ReplaceParameters(map, second.Body); // apply composition of lambda expression bodies to parameters from the first expression return Expression.Lambda(merge(first.Body, secondBody), first.Parameters); } @@ -496,18 +496,18 @@ namespace VOL.Core.Extensions public object Value { get; set; } // public } - public class ParameterRebinder : ExpressionVisitor + public class ParameterRebind : ExpressionVisitor { private readonly Dictionary map; - public ParameterRebinder(Dictionary map) + public ParameterRebind(Dictionary map) { this.map = map ?? new Dictionary(); } public static Expression ReplaceParameters(Dictionary map, Expression exp) { - return new ParameterRebinder(map).Visit(exp); + return new ParameterRebind(map).Visit(exp); } protected override Expression VisitParameter(ParameterExpression p) { diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/RequestExtension.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/RequestExtension.cs" index ea3541ce..a8bfb36d 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/RequestExtension.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/RequestExtension.cs" @@ -128,7 +128,7 @@ namespace VOL.Core.Extensions if (context.Request.Body.Position > 0) context.Request.Body.Position = 0; - string prarameters = null; + string parameters = null; var bodyStream = context.Request.Body; using (var buffer = new MemoryStream()) @@ -139,10 +139,10 @@ namespace VOL.Core.Extensions using (var reader = new StreamReader(buffer, Encoding.UTF8)) { buffer.Seek(0, SeekOrigin.Begin); - prarameters = reader.ReadToEnd(); + parameters = reader.ReadToEnd(); } } - return prarameters; + return parameters; } } } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/Response/ResponseMsg.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/Response/ResponseMsg.cs" index 934d995d..037e655e 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/Response/ResponseMsg.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/Response/ResponseMsg.cs" @@ -35,7 +35,7 @@ namespace VOL.Core.Extensions msg = "没有主键不能删除"; break; case ResponseType.KeyError: msg = "主键不正确或没有传入主键"; break; - case ResponseType.EidtSuccess: + case ResponseType.EditSuccess: msg = "编辑成功"; break; case ResponseType.DelSuccess: msg = "删除成功"; break; diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/StringExtension.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/StringExtension.cs" index f5e3aa0d..33a2bb85 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/StringExtension.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Extensions/StringExtension.cs" @@ -23,7 +23,7 @@ namespace VOL.Core.Extensions private static long longTime = 621355968000000000; - private static int samllTime = 10000000; + private static int smallTime = 10000000; /// /// 获取时间戳 /// @@ -31,17 +31,17 @@ namespace VOL.Core.Extensions /// public static long GetTimeStamp(this DateTime dateTime) { - return (dateTime.ToUniversalTime().Ticks - longTime) / samllTime; + return (dateTime.ToUniversalTime().Ticks - longTime) / smallTime; } /// /// 时间戳转换成日期 /// /// /// - public static DateTime GetTimeSpmpToDate(this object timeStamp) + public static DateTime GetTimestampToDate(this object timeStamp) { if (timeStamp == null) return dateStart; - DateTime dateTime = new DateTime(longTime + Convert.ToInt64(timeStamp) * samllTime, DateTimeKind.Utc).ToLocalTime(); + DateTime dateTime = new DateTime(longTime + Convert.ToInt64(timeStamp) * smallTime, DateTimeKind.Utc).ToLocalTime(); return dateTime; } public static string CreateHtmlParas(this string urlPath, int? userId = null) @@ -83,35 +83,35 @@ namespace VOL.Core.Extensions public static string GetDBCondition(this string stringType) { - string reslut = ""; + string result = ""; switch (stringType?.ToLower()) { case HtmlElementType.droplist: case HtmlElementType.selectlist: case HtmlElementType.textarea: case HtmlElementType.checkbox: - reslut = HtmlElementType.Contains; + result = HtmlElementType.Contains; break; case HtmlElementType.thanorequal: - reslut = HtmlElementType.ThanOrEqual; + result = HtmlElementType.ThanOrEqual; break; case HtmlElementType.lessorequal: - reslut = HtmlElementType.LessOrequal; + result = HtmlElementType.LessOrequal; break; case HtmlElementType.gt: - reslut = HtmlElementType.GT; + result = HtmlElementType.GT; break; case HtmlElementType.lt: - reslut = HtmlElementType.lt; + result = HtmlElementType.lt; break; case HtmlElementType.like: - reslut = HtmlElementType.like; + result = HtmlElementType.like; break; default: - reslut = HtmlElementType.Equal; + result = HtmlElementType.Equal; break; } - return reslut; + return result; } public static LinqExpressionType GetLinqCondition(this string stringType) @@ -160,8 +160,8 @@ namespace VOL.Core.Extensions { if (obj == null) return false; - bool reslut = Int32.TryParse(obj.ToString(), out int _number); - return reslut; + bool result = Int32.TryParse(obj.ToString(), out int _number); + return result; } public static bool IsDate(this object str) diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ActionPermissionFilter.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ActionPermissionFilter.cs" index 1fdb1b4a..78d7cbcf 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ActionPermissionFilter.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ActionPermissionFilter.cs" @@ -102,7 +102,7 @@ namespace VOL.Core.Filters || actionAuth.Count() == 0 || !actionAuth.Contains(ActionPermission.TableAction)) { - Logger.Info(LoggerType.Authorzie, $"没有权限操作," + + Logger.Info(LoggerType.Authorize, $"没有权限操作," + $"用户ID{_userContext.UserId}:{_userContext.UserTrueName}," + $"角色ID:{_userContext.RoleId}:{_userContext.UserInfo.RoleName}," + $"操作权限{ActionPermission.TableName}:{ActionPermission.TableAction}"); diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ApiAuthorizeFilter.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ApiAuthorizeFilter.cs" index d3d7a5fd..395e7cae 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ApiAuthorizeFilter.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ApiAuthorizeFilter.cs" @@ -73,7 +73,7 @@ namespace VOL.Core.Filters //} DateTime expDate = context.HttpContext.User.Claims.Where(x => x.Type == JwtRegisteredClaimNames.Exp) - .Select(x => x.Value).FirstOrDefault().GetTimeSpmpToDate(); + .Select(x => x.Value).FirstOrDefault().GetTimestampToDate(); //动态标识刷新token(2021.05.01) if ((expDate - DateTime.Now).TotalMinutes < AppSetting.ExpMinutes/ 3 && context.HttpContext.Request.Path != replaceTokenPath) { diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/FixedTokenAttribute.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/FixedTokenAttribute.cs" index 9df7752b..19caae61 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/FixedTokenAttribute.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/FixedTokenAttribute.cs" @@ -18,19 +18,19 @@ namespace VOL.Core.Filters { public AuthorizationFilterContext OnAuthorization(AuthorizationFilterContext context) { - string fixedoken = ""; + string fixedToken = ""; //如果token已失效，直接获取header里的token if (!context.HttpContext.User.Identity.IsAuthenticated) { - fixedoken = context.HttpContext.Request.Headers[AppSetting.TokenHeaderName]; - fixedoken = fixedoken?.Replace("Bearer ", ""); + fixedToken = context.HttpContext.Request.Headers[AppSetting.TokenHeaderName]; + fixedToken = fixedToken?.Replace("Bearer ", ""); //判断是否传入了token - if (string.IsNullOrEmpty(fixedoken)) + if (string.IsNullOrEmpty(fixedToken)) { return context.Unauthorized("没有传入token"); } //解析token - int userId = JwtHelper.GetUserId(fixedoken); + int userId = JwtHelper.GetUserId(fixedToken); if (userId <= 0) { return context.Unauthorized("token不正确"); @@ -39,11 +39,11 @@ namespace VOL.Core.Filters } else { - fixedoken = ((ClaimsIdentity)context.HttpContext.User.Identity) + fixedToken = ((ClaimsIdentity)context.HttpContext.User.Identity) ?.BootstrapContext?.ToString(); } //判断当前用户的token与缓存的token是否相同 - if (UserContext.Current.Token != fixedoken) + if (UserContext.Current.Token != fixedToken) { context.FilterResult(HttpStatusCode.Unauthorized, "token已失效"); } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ServiceFunFilter.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ServiceFunFilter.cs" index de885549..eb7634a7 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ServiceFunFilter.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Filters/ServiceFunFilter.cs" @@ -38,9 +38,9 @@ namespace VOL.Core.Filters /// 明细table 统计、求和、平均值等 /// /// - /// + /// /// - protected abstract object GetDetailSummary(IQueryable queryeable); + protected abstract object GetDetailSummary(IQueryable queryable); /// /// 是否开启用户数据权限,true=用户只能操作自己(及下级角色)创建的数据,如:查询、删除、修改等操作 @@ -54,7 +54,7 @@ namespace VOL.Core.Filters /// /// 默认上传文件大小限制3M /// - protected int LimitUpFileSizee { get; set; } = 3; + protected int LimitUpFileSize { get; set; } = 3; /// diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Infrastructure/DictionaryHandler.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Infrastructure/DictionaryHandler.cs" index 5be1013b..8024fb4d 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Infrastructure/DictionaryHandler.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Infrastructure/DictionaryHandler.cs" @@ -56,7 +56,6 @@ namespace VOL.Core.Infrastructure /// /// 获取解决的数据源，只能看到自己与下级所有角色 /// - /// /// /// public static string GetRolesSql(string originalSql) @@ -65,9 +64,9 @@ namespace VOL.Core.Infrastructure { return originalSql; } - int currnetRoleId = UserContext.Current.RoleId; - List roleIds = RoleContext.GetAllChildrenIds(currnetRoleId); - roleIds.Add(currnetRoleId); + int currentRoleId = UserContext.Current.RoleId; + List roleIds = RoleContext.GetAllChildrenIds(currentRoleId); + roleIds.Add(currentRoleId); string sql = $@"SELECT Role_Id as 'key',RoleName as 'value' FROM Sys_Role WHERE Enable=1 and Role_Id in ({string.Join(',', roleIds)})"; return sql; diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Infrastructure/DictionaryManager.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Infrastructure/DictionaryManager.cs" index cf4e994d..14f82472 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Infrastructure/DictionaryManager.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Infrastructure/DictionaryManager.cs" @@ -15,7 +15,7 @@ namespace VOL.Core.Infrastructure private static List _dictionaries { get; set; } private static object _dicObj = new object(); - private static string _dicVersionn = ""; + private static string _dicVersion = ""; public const string Key = "inernalDic"; public static List Dictionaries @@ -42,7 +42,7 @@ namespace VOL.Core.Infrastructure { try { - return DBServerProvider.SqlDapper.QueryList(sql, null).Select(s => new Sys_DictionaryList() + return DBServerProvider.SqlDapper.QueryList(sql, null).Select(s => new Sys_DictionaryList() { DicName = s.Value, DicValue = s.Key.ToString() @@ -78,14 +78,14 @@ namespace VOL.Core.Infrastructure { ICacheService cacheService = AutofacContainerModule.GetService(); //每次比较缓存是否更新过，如果更新则重新获取数据 - if (_dictionaries != null && _dicVersionn == cacheService.Get(Key)) + if (_dictionaries != null && _dicVersion == cacheService.Get(Key)) { return _dictionaries; } lock (_dicObj) { - if (_dicVersionn != "" && _dictionaries != null && _dicVersionn == cacheService.Get(Key)) return _dictionaries; + if (_dicVersion != "" && _dictionaries != null && _dicVersion == cacheService.Get(Key)) return _dictionaries; _dictionaries = DBServerProvider.DbContext .Set() .Where(x => x.Enable == 1) @@ -99,14 +99,14 @@ namespace VOL.Core.Infrastructure } else { - _dicVersionn = cacheVersion; + _dicVersion = cacheVersion; } } return _dictionaries; } } - public class SourceKeyVaule + public class SourceKeyValue { public object Key { get; set; } public string Value { get; set; } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/ObjectActionValidator/ExpressValidator/MethodsValidator.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/ObjectActionValidator/ExpressValidator/MethodsValidator.cs" index 765723c9..ed98e4ae 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/ObjectActionValidator/ExpressValidator/MethodsValidator.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/ObjectActionValidator/ExpressValidator/MethodsValidator.cs" @@ -208,7 +208,7 @@ namespace VOL.Core.ObjectActionValidator PropertyInfo[] properties = model.GetType().GetProperties().Where(x => parameters.Contains(x.Name.ToLower())).ToArray(); foreach (var item in properties) { - if (!item.ValidationRquiredValueForDbType(item.GetValue(model), out string message)) + if (!item.ValidationRequiredValueForDbType(item.GetValue(model), out string message)) { actionContext.ErrorResult(message); return; diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Quartz/HttpResultfulJob.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Quartz/HttpResultfulJob.cs" index 28b7258f..21e770cf 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Quartz/HttpResultfulJob.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Quartz/HttpResultfulJob.cs" @@ -98,7 +98,7 @@ namespace VOL.Core.Quartz ElapsedTime = Convert.ToInt32((DateTime.Now - dateTime).TotalSeconds), ResponseContent = httpMessage, ErrorMsg = exceptionMsg, - StratDate = dateTime, + StartDate = dateTime, Result = exceptionMsg == null ? 1 : 0, EndDate = DateTime.Now }; diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Services/Logger.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Services/Logger.cs" index 03b5524a..fac49e5b 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Services/Logger.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Services/Logger.cs" @@ -39,9 +39,9 @@ namespace VOL.Core.Services { Info(loggerType, message, null, null); } - public static void Info(LoggerType loggerType, string requestParam, string resposeParam, string ex = null) + public static void Info(LoggerType loggerType, string requestParam, string responseParam, string ex = null) { - Add(loggerType, requestParam, resposeParam, ex, LoggerStatus.Info); + Add(loggerType, requestParam, responseParam, ex, LoggerStatus.Info); } public static void OK(string message) @@ -52,9 +52,9 @@ namespace VOL.Core.Services { OK(loggerType, message, null, null); } - public static void OK(LoggerType loggerType, string requestParam, string resposeParam, string ex = null) + public static void OK(LoggerType loggerType, string requestParam, string responseParam, string ex = null) { - Add(loggerType, requestParam, resposeParam, ex, LoggerStatus.Success); + Add(loggerType, requestParam, responseParam, ex, LoggerStatus.Success); } public static void Error(string message) { @@ -64,9 +64,9 @@ namespace VOL.Core.Services { Error(loggerType, message, null, null); } - public static void Error(LoggerType loggerType, string requestParam, string resposeParam, string ex = null) + public static void Error(LoggerType loggerType, string requestParam, string responseParam, string ex = null) { - Add(loggerType, requestParam, resposeParam, ex, LoggerStatus.Error); + Add(loggerType, requestParam, responseParam, ex, LoggerStatus.Error); } /// @@ -83,7 +83,7 @@ namespace VOL.Core.Services { HttpContext context = Utilities.HttpContext.Current; if (context.Request.Method == "OPTIONS") return; - ActionObserver cctionObserver = (context.RequestServices.GetService(typeof(ActionObserver)) as ActionObserver); + ActionObserver actionObserver = (context.RequestServices.GetService(typeof(ActionObserver)) as ActionObserver); if (context == null) { WriteText($"未获取到httpcontext信息,type:{loggerType.ToString()},reqParam:{requestParameter},respParam:{responseParameter},ex:{ex},success:{status.ToString()}"); @@ -92,7 +92,7 @@ namespace VOL.Core.Services UserInfo userInfo = UserContext.Current.UserInfo; log = new Sys_Log() { - BeginDate = cctionObserver.RequestDate, + BeginDate = actionObserver.RequestDate, EndDate = DateTime.Now, User_Id = userInfo.User_Id, UserName = userInfo.UserTrueName, diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/UserManager/RoleContext.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/UserManager/RoleContext.cs" index 5176819b..75c725c2 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/UserManager/RoleContext.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/UserManager/RoleContext.cs" @@ -14,7 +14,7 @@ namespace VOL.Core.UserManager { private static object _RoleObj = new object(); - private static string _RoleVersionn = ""; + private static string _RoleVersion = ""; public const string Key = "inernalRole"; private static List _roles { get; set; } @@ -22,13 +22,13 @@ namespace VOL.Core.UserManager { ICacheService cacheService = AutofacContainerModule.GetService(); //每次比较缓存是否更新过，如果更新则重新获取数据 - if (_roles != null && _RoleVersionn == cacheService.Get(Key)) + if (_roles != null && _RoleVersion == cacheService.Get(Key)) { return _roles; } lock (_RoleObj) { - if (_RoleVersionn != "" && _roles != null && _RoleVersionn == cacheService.Get(Key)) return _roles; + if (_RoleVersion != "" && _roles != null && _RoleVersion == cacheService.Get(Key)) return _roles; _roles = DBServerProvider.DbContext .Set() .Where(x => x.Enable == 1) @@ -43,7 +43,7 @@ namespace VOL.Core.UserManager } else { - _RoleVersionn = cacheVersion; + _RoleVersion = cacheVersion; } } return _roles; diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/UserManager/UserContext.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/UserManager/UserContext.cs" index 1e896bfe..eb53d9fe 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/UserManager/UserContext.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/UserManager/UserContext.cs" @@ -254,9 +254,8 @@ namespace VOL.Core.ManageUser string roleKey = roleId.GetRoleIdKey(); //角色有缓存，并且当前服务器的角色版本号与redis/memory缓存角色的版本号相同直接返回静态对象角色权限 - string currnetVeriosn = ""; - if (rolePermissionsVersion.TryGetValue(roleId, out currnetVeriosn) - && currnetVeriosn == cacheService.Get(roleKey)) + if (rolePermissionsVersion.TryGetValue(roleId, out var currentVersion) + && currentVersion == cacheService.Get(roleKey)) { return rolePermissions.ContainsKey(roleId) ? rolePermissions[roleId] : new List(); } @@ -266,8 +265,8 @@ namespace VOL.Core.ManageUser //锁定每个角色 lock (objId) { - if (rolePermissionsVersion.TryGetValue(roleId, out currnetVeriosn) - && currnetVeriosn == cacheService.Get(roleKey)) + if (rolePermissionsVersion.TryGetValue(roleId, out currentVersion) + && currentVersion == cacheService.Get(roleKey)) { return rolePermissions.ContainsKey(roleId) ? rolePermissions[roleId] : new List(); } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/EPPlusHelper.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/EPPlusHelper.cs" index bd3c2191..18b4fb53 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/EPPlusHelper.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/EPPlusHelper.cs" @@ -106,7 +106,7 @@ namespace VOL.Core.Utilities //2021.06.04优化判断 if (string.IsNullOrEmpty(value)) { - if (options.Requierd) + if (options.Required) { return responseContent.Error($"第{m}行[{options.ColumnCNName}]验证未通过,不能为空。"); } @@ -165,7 +165,7 @@ namespace VOL.Core.Utilities } //验证导入与实体数据类型是否相同 - (bool, string, object) result = property.ValidationProperty(value, options.Requierd); + (bool, string, object) result = property.ValidationProperty(value, options.Required); if (!result.Item1) { @@ -401,7 +401,7 @@ namespace VOL.Core.Utilities if (template) { fontColor = Color.Black; - if (cellOptions.Exists(x => x.ColumnName == columnName && x.Requierd)) + if (cellOptions.Exists(x => x.ColumnName == columnName && x.Required)) { backgroundColor = Color.Yellow; //黄色必填 } @@ -490,10 +490,10 @@ namespace VOL.Core.Utilities /// 获取导出的列的数据信息 /// /// - /// 是否为下载模板 + /// 是否为下载模板 /// filterKeyValue是否过滤Key相同的数据 /// - private static List GetExportColumnInfo(string tableName, bool temlate = false, bool filterKeyValue = true, string[] columns = null) + private static List GetExportColumnInfo(string tableName, bool template = false, bool filterKeyValue = true, string[] columns = null) { //&& x.IsDisplay == 1&&x.IsReadDataset==0只导出代码生器中设置为显示并且不是只读的列，可根据具体业务设置导出列 // && x.IsReadDataset == 0 @@ -513,7 +513,7 @@ namespace VOL.Core.Utilities ColumnName = c.ColumnName, ColumnCNName = c.ColumnCnName, DropNo = c.DropNo, - Requierd = c.IsNull > 0 ? false : true, + Required = c.IsNull > 0 ? false : true, ColumnWidth = c.ColumnWidth ?? 90, EditType = c.EditType, SearchType = c.SearchType @@ -521,7 +521,7 @@ namespace VOL.Core.Utilities }).ToList(); - if (temlate) return cellOptions; + if (template) return cellOptions; var dicNos = cellOptions.Where(x => !string.IsNullOrEmpty(x.DropNo)).Select(c => c.DropNo); @@ -640,7 +640,7 @@ namespace VOL.Core.Utilities public string ColumnCNName { get; set; }//导出列的中文名 public string DropNo { get; set; }//字典编号 public int ColumnWidth { get; set; }//导出列的宽度,代码生成维护的宽度 - public bool Requierd { get; set; } //是否必填 + public bool Required { get; set; } //是否必填 public int Index { get; set; }//列所在模板的序号(导入用) //2021.01.24修复多选类型，导出excel文件没有转换数据源的问题 public string EditType { get; set; } diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/FileHelper.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/FileHelper.cs" index 5ac20c98..78a82236 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/FileHelper.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/FileHelper.cs" @@ -175,63 +175,63 @@ namespace VOL.Core.Utilities /// /// 拷贝文件 /// - /// 原始文件 - /// 新文件路径 - public static void FileCoppy(string OrignFile, string NewFile) + /// 原始文件 + /// 新文件路径 + public static void FileCopy(string originalFile, string newFile) { - File.Copy(OrignFile.ReplacePath(), NewFile.ReplacePath(), true); + File.Copy(originalFile.ReplacePath(), newFile.ReplacePath(), true); } /// /// 删除文件 /// - /// 路径 - public static void FileDel(string Path) + /// 路径 + public static void FileDel(string path) { - File.Delete(Path.ReplacePath()); + File.Delete(path.ReplacePath()); } /// /// 移动文件 /// - /// 原始路径 - /// 新路径 - public static void FileMove(string OrignFile, string NewFile) + /// 原始路径 + /// 新路径 + public static void FileMove(string originalFile, string newFile) { - File.Move(OrignFile.ReplacePath(), NewFile.ReplacePath()); + File.Move(originalFile.ReplacePath(), newFile.ReplacePath()); } /// /// 在当前目录下创建目录 /// - /// 当前目录 - /// 新目录 - public static void FolderCreate(string OrignFolder, string NewFloder) + /// 当前目录 + /// 新目录 + public static void FolderCreate(string originalFolder, string newFolder) { - Directory.SetCurrentDirectory(OrignFolder.ReplacePath()); - Directory.CreateDirectory(NewFloder.ReplacePath()); + Directory.SetCurrentDirectory(originalFolder.ReplacePath()); + Directory.CreateDirectory(newFolder.ReplacePath()); } /// /// 创建文件夹 /// - /// - public static void FolderCreate(string Path) + /// + public static void FolderCreate(string path) { // 判断目标目录是否存在如果不存在则新建之 - if (!Directory.Exists(Path.ReplacePath())) - Directory.CreateDirectory(Path.ReplacePath()); + if (!Directory.Exists(path.ReplacePath())) + Directory.CreateDirectory(path.ReplacePath()); } - public static void FileCreate(string Path) + public static void FileCreate(string path) { - FileInfo CreateFile = new FileInfo(Path.ReplacePath()); //创建文件 - if (!CreateFile.Exists) + FileInfo createFile = new FileInfo(path.ReplacePath()); //创建文件 + if (!createFile.Exists) { - FileStream FS = CreateFile.Create(); - FS.Close(); + FileStream fs = createFile.Create(); + fs.Close(); } } /// @@ -326,7 +326,7 @@ namespace VOL.Core.Utilities /// /// 文件详细路径 /// - public static string GetFileAttibe(string filePath) + public static string GetFileAttribute(string filePath) { string str = ""; filePath = filePath.ReplacePath(); diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/JwtHelper.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/JwtHelper.cs" index f3ece2d4..3afbb922 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/JwtHelper.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/JwtHelper.cs" @@ -73,7 +73,7 @@ namespace VOL.Core.Utilities var jwtHandler = new JwtSecurityTokenHandler(); JwtSecurityToken jwtToken = jwtHandler.ReadJwtToken(jwtStr); - DateTime expDate = (jwtToken.Payload[JwtRegisteredClaimNames.Exp] ?? 0).GetInt().GetTimeSpmpToDate(); + DateTime expDate = (jwtToken.Payload[JwtRegisteredClaimNames.Exp] ?? 0).GetInt().GetTimestampToDate(); return expDate; } public static bool IsExp(string jwtStr) diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCode.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCode.cs" index 6b6285cb..2bb40793 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCode.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCode.cs" @@ -8,7 +8,7 @@ using System.Text; namespace VOL.Core.Utilities { - public static class VierificationCode + public static class VerificationCode { private static readonly string[] _chars = new string[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "P", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" }; public static string RandomText() @@ -35,7 +35,7 @@ namespace VOL.Core.Utilities [SupportedOSPlatform("Windows")] [Obsolete("仅在 Windows 上支持 System.Drawing.Common,具体请参考：https://docs.microsoft.com/zh-cn/dotnet/core/compatibility/core-libraries/6.0/system-drawing-common-windows-only")] - public static string CreateBase64Imgage(string code) + public static string CreateBase64Image(string code) { Random random = new Random(); //验证码颜色集合 diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCodeHelpers.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCodeHelpers.cs" index 3ed7a2d4..8bf8156a 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCodeHelpers.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCodeHelpers.cs" @@ -5,7 +5,7 @@ using System.Linq; namespace VOL.Core.Utilities { - public static class VierificationCodeHelpers + public static class VerificationCodeHelpers { //验证码字体集合 private static readonly string[] fonts = { "Verdana", "Microsoft Sans Serif", "Comic Sans MS", "Arial", "宋体" }; private static readonly SKColor[] colors = { SKColors.Black, SKColors.Green, SKColors.Brown }; diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCodeServices.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCodeServices.cs" index d34fd058..7154e597 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCodeServices.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/Utilities/VierificationCodeServices.cs" @@ -6,11 +6,11 @@ using System.Runtime.InteropServices; namespace VOL.Core.Utilities { - public static class VierificationCodeServices + public static class VerificationCodeServices { //验证码字体集合 private static readonly string[] fonts = null; - static VierificationCodeServices() + static VerificationCodeServices() { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { diff --git "a/.Net6\347\211\210\346\234\254/VOL.Core/WorkFlow/WorkFlowManager.cs" "b/.Net6\347\211\210\346\234\254/VOL.Core/WorkFlow/WorkFlowManager.cs" index 18e45804..05739db7 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Core/WorkFlow/WorkFlowManager.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Core/WorkFlow/WorkFlowManager.cs" @@ -43,8 +43,8 @@ namespace VOL.Core.WorkFlow private static void Rewrite(T entity, Sys_WorkFlow workFlow, bool changeTableStatus) where T : class { - var autditProperty = typeof(T).GetProperties().Where(x => x.Name.ToLower() == "auditstatus").FirstOrDefault(); - if (autditProperty == null) + var auditProperty = typeof(T).GetProperties().Where(x => x.Name.ToLower() == "auditstatus").FirstOrDefault(); + if (auditProperty == null) { return; } @@ -72,8 +72,8 @@ namespace VOL.Core.WorkFlow if (changeTableStatus) { dbContext.Entry(entity).State = EntityState.Detached; - autditProperty.SetValue(entity, 0); - dbContext.Entry(entity).Property(autditProperty.Name).IsModified = true; + auditProperty.SetValue(entity, 0); + dbContext.Entry(entity).Property(auditProperty.Name).IsModified = true; } var wlowTableStep = workFlow.Sys_WorkFlowStep.OrderBy(x => x.OrderId).Select(s => new Sys_WorkFlowTableStep() @@ -103,7 +103,7 @@ namespace VOL.Core.WorkFlow /// /// 是否重新生成流程 /// 是否修改原表的审批状态 - public static void AddProcese(T entity, bool rewrite = false, bool changeTableStatus = true) where T : class + public static void AddProcess(T entity, bool rewrite = false, bool changeTableStatus = true) where T : class { string workTable = typeof(T).GetEntityTableName(); @@ -163,12 +163,12 @@ namespace VOL.Core.WorkFlow /// /// /// - /// + /// /// /// /// public static WebResponseContent Audit(T entity, AuditStatus status, string remark, - PropertyInfo autditProperty, + PropertyInfo auditProperty, Func workFlowExecuting, Func, bool, WebResponseContent> workFlowExecuted, bool init = false, @@ -213,16 +213,16 @@ namespace VOL.Core.WorkFlow workFlow.AuditStatus = (int)status; if (workFlow == null || workFlow.Sys_WorkFlowTableStep.Count == 0) { - autditProperty.SetValue(entity, (int)status); + auditProperty.SetValue(entity, (int)status); query.Update(entity); dbContext.SaveChanges(); return webResponse; } - var currnetStep = workFlow.Sys_WorkFlowTableStep.Where(x => x.OrderId == workFlow.CurrentOrderId).FirstOrDefault(); - if (currnetStep == null) + var currentStep = workFlow.Sys_WorkFlowTableStep.Where(x => x.OrderId == workFlow.CurrentOrderId).FirstOrDefault(); + if (currentStep == null) { - autditProperty.SetValue(entity, (int)status); + auditProperty.SetValue(entity, (int)status); query.Update(entity); dbContext.SaveChanges(); return webResponse; @@ -235,12 +235,12 @@ namespace VOL.Core.WorkFlow { workFlow.CurrentOrderId = nextStep.OrderId; //原表显示审核中状态 - autditProperty.SetValue(entity, (int)AuditStatus.审核中); + auditProperty.SetValue(entity, (int)AuditStatus.审核中); workFlow.AuditStatus = (int)AuditStatus.审核中; } else { - autditProperty.SetValue(entity, (int)status); + auditProperty.SetValue(entity, (int)status); } bool isLast = nextStep == null; @@ -256,11 +256,11 @@ namespace VOL.Core.WorkFlow query.Update(entity); var user = UserContext.Current.UserInfo; - currnetStep.AuditId = user.User_Id; - currnetStep.Auditor = user.UserTrueName; - currnetStep.AuditDate = DateTime.Now; - currnetStep.AuditStatus = (int)status; - currnetStep.Remark = remark; + currentStep.AuditId = user.User_Id; + currentStep.Auditor = user.UserTrueName; + currentStep.AuditDate = DateTime.Now; + currentStep.AuditStatus = (int)status; + currentStep.Remark = remark; //dbContext.Entry(workFlow).Property("CurrentOrderId").IsModified = true; diff --git "a/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/App/test2019.cs" "b/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/App/test2019.cs" index 2b9a2522..48dccb8b 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/App/test2019.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/App/test2019.cs" @@ -55,10 +55,10 @@ namespace VOL.Entity.DomainModels /// /// /// - [Display(Name ="timepsan")] + [Display(Name ="timespan")] [Column(TypeName="datetime")] [Editable(true)] - public DateTime? timepsan { get; set; } + public DateTime? timespan { get; set; } /// /// diff --git "a/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/Quartz/Sys_QuartzLog.cs" "b/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/Quartz/Sys_QuartzLog.cs" index b04c387d..1a07855a 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/Quartz/Sys_QuartzLog.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/Quartz/Sys_QuartzLog.cs" @@ -57,7 +57,7 @@ namespace VOL.Entity.DomainModels [Display(Name ="开始时间")] [Column(TypeName="datetime")] [Editable(true)] - public DateTime? StratDate { get; set; } + public DateTime? StartDate { get; set; } /// ///结束时间 diff --git "a/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/System/Sys_User.cs" "b/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/System/Sys_User.cs" index ddace5be..dd416046 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/System/Sys_User.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Entity/DomainModels/System/Sys_User.cs" @@ -140,7 +140,7 @@ namespace VOL.Entity.DomainModels [Column(TypeName="int")] [Editable(true)] [Required(AllowEmptyStrings=false)] - public int IsRegregisterPhone { get; set; } + public int IsRegisterPhone { get; set; } /// ///手机号 diff --git "a/.Net6\347\211\210\346\234\254/VOL.Entity/MappingConfiguration/MappingManager.cs" "b/.Net6\347\211\210\346\234\254/VOL.Entity/MappingConfiguration/MappingManager.cs" index 98f41ca6..a2621311 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Entity/MappingConfiguration/MappingManager.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Entity/MappingConfiguration/MappingManager.cs" @@ -28,7 +28,7 @@ namespace VOL.Entity.MappingConfiguration } } - public static class ModelBuilderExtenions + public static class ModelBuilderExtensions { private static IEnumerable GetMappingTypes(this Assembly assembly, Type mappingInterface) { diff --git "a/.Net6\347\211\210\346\234\254/VOL.Order/Services/Sell/Partial/SellOrderService.cs" "b/.Net6\347\211\210\346\234\254/VOL.Order/Services/Sell/Partial/SellOrderService.cs" index 87042953..08fefe71 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.Order/Services/Sell/Partial/SellOrderService.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.Order/Services/Sell/Partial/SellOrderService.cs" @@ -114,11 +114,11 @@ namespace VOL.Order.Services /// 设置弹出框明细表的合计信息 /// /// - /// + /// /// - protected override object GetDetailSummary(IQueryable queryeable) + protected override object GetDetailSummary(IQueryable queryable) { - return (queryeable as IQueryable).GroupBy(x => 1).Select(x => new + return (queryable as IQueryable).GroupBy(x => 1).Select(x => new { //Weight/Qty注意大小写和数据库字段大小写一样 Weight = x.Sum(o => o.Weight), diff --git "a/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_MenuService.cs" "b/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_MenuService.cs" index e3326d03..48643572 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_MenuService.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_MenuService.cs" @@ -26,7 +26,7 @@ namespace VOL.System.Services /// /// 当前服务器的菜单版本 /// - private static string _menuVersionn = ""; + private static string _menuVersion = ""; private const string _menuCacheKey = "inernalMenu"; @@ -54,13 +54,13 @@ namespace VOL.System.Services { //每次比较缓存是否更新过，如果更新则重新获取数据 string _cacheVersion = CacheContext.Get(_menuCacheKey); - if (_menuVersionn != "" && _menuVersionn == _cacheVersion) + if (_menuVersion != "" && _menuVersion == _cacheVersion) { return _menus ?? new List(); } lock (_menuObj) { - if (_menuVersionn != "" && _menus != null && _menuVersionn == _cacheVersion) return _menus; + if (_menuVersion != "" && _menus != null && _menuVersion == _cacheVersion) return _menus; //2020.12.27增加菜单界面上不显示，但可以分配权限 _menus = repository.FindAsIQueryable(x => x.Enable == 1 || x.Enable == 2) .OrderByDescending(a => a.OrderNo) @@ -89,7 +89,7 @@ namespace VOL.System.Services } else { - _menuVersionn = cacheVersion; + _menuVersion = cacheVersion; } } return _menus; diff --git "a/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_RoleService.cs" "b/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_RoleService.cs" index 0daa8e87..e3155724 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_RoleService.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_RoleService.cs" @@ -221,7 +221,7 @@ namespace VOL.System.Services //当前用户的权限 List permissions = UserContext.Current.Permissions; - List originalMeunIds = new List(); + List originalMenuIds = new List(); //被分配角色的权限 List roleAuths = await repository.FindAsync(x => x.Role_Id == roleId); List updateAuths = new List(); @@ -256,7 +256,7 @@ namespace VOL.System.Services } else { - originalMeunIds.Add(auth.Menu_Id); + originalMenuIds.Add(auth.Menu_Id); } } @@ -273,7 +273,7 @@ namespace VOL.System.Services //获取权限取消的权限 int[] authIds = roleAuths.Where(x => userPermissions.Select(u => u.Id) - .ToList().Contains(x.Menu_Id) || originalMeunIds.Contains(x.Menu_Id)) + .ToList().Contains(x.Menu_Id) || originalMenuIds.Contains(x.Menu_Id)) .Select(s => s.Auth_Id) .ToArray(); List delAuths = roleAuths.Where(x => x.AuthValue != "" && !authIds.Contains(x.Auth_Id)).ToList(); diff --git "a/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_UserService.cs" "b/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_UserService.cs" index b9e8fb11..ff5e4628 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_UserService.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.System/Services/System/Partial/Sys_UserService.cs" @@ -134,7 +134,7 @@ namespace VOL.System.Services } finally { - Logger.Info(LoggerType.ReplaceToeken, ($"用户Id:{userInfo?.User_Id},用户{userInfo?.UserTrueName}") + Logger.Info(LoggerType.ReplaceToken, ($"用户Id:{userInfo?.User_Id},用户{userInfo?.UserTrueName}") + (webResponse.Status ? "token替换成功" : "token替换失败"), null, error); } return webResponse; diff --git "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/Builder/BuilderController.cs" "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/Builder/BuilderController.cs" index b61e9393..20ddb0ee 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/Builder/BuilderController.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/Builder/BuilderController.cs" @@ -50,9 +50,9 @@ namespace VOL.WebApi.Controllers.Builder [Route("Save")] [ApiActionPermission(ActionRolePermission.SuperAdmin)] [HttpPost] - public ActionResult SaveEidt([FromBody] Sys_TableInfo tableInfo) + public ActionResult SaveEdit([FromBody] Sys_TableInfo tableInfo) { - return Json(Service.SaveEidt(tableInfo)); + return Json(Service.SaveEdit(tableInfo)); } [Route("CreateServices")] [ApiActionPermission(ActionRolePermission.SuperAdmin)] diff --git "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/Hubs/HomePageMessageHub.cs" "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/Hubs/HomePageMessageHub.cs" index e53207d0..dd3b662b 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/Hubs/HomePageMessageHub.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/Hubs/HomePageMessageHub.cs" @@ -69,7 +69,7 @@ namespace VOL.WebApi.Controllers.Hubs /// /// /// - private IEnumerable GetCnnectionIds(string username) + private IEnumerable GetConnectionIds(string username) { foreach (var item in _connectionIds) { @@ -92,7 +92,7 @@ namespace VOL.WebApi.Controllers.Hubs { return false; } - await Clients.Clients(GetCnnectionIds(username).ToArray()).SendAsync("ReceiveHomePageMessage", new + await Clients.Clients(GetConnectionIds(username).ToArray()).SendAsync("ReceiveHomePageMessage", new { // username, title, diff --git "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/System/Partial/Sys_UserController.cs" "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/System/Partial/Sys_UserController.cs" index 74db4f63..f9197a1a 100644 --- "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/System/Partial/Sys_UserController.cs" +++ "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Controllers/System/Partial/Sys_UserController.cs" @@ -38,12 +38,12 @@ namespace VOL.System.Controllers public Sys_UserController( ISys_UserService userService, ISys_UserRepository userRepository, - ICacheService cahce + ICacheService cache ) : base(userService) { _userRepository = userRepository; - _cache = cahce; + _cache = cache; } [HttpPost, HttpGet, Route("login"), AllowAnonymous] @@ -113,7 +113,7 @@ namespace VOL.System.Controllers { _lockCurrent.TryRemove(UserContext.Current.UserId, out object val); string _message = $"用户{userInfo?.User_Id}_{userInfo?.UserTrueName},({(responseContent.Status ? "token替换成功": "token替换失败")})"; - Logger.Info(LoggerType.ReplaceToeken, _message, null, error); + Logger.Info(LoggerType.ReplaceToken, _message, null, error); } return Json(responseContent); } @@ -163,13 +163,13 @@ namespace VOL.System.Controllers /// 2020.06.15增加登陆验证码 /// /// - [HttpGet, Route("getVierificationCode"), AllowAnonymous] - public IActionResult GetVierificationCode() + [HttpGet, Route("getVerificationCode"), AllowAnonymous] + public IActionResult GetVerificationCode() { - string code = VierificationCode.RandomText(); + string code = VerificationCode.RandomText(); var data = new { - img = VierificationCodeHelpers.CreateBase64Image(code), + img = VerificationCodeHelpers.CreateBase64Image(code), uuid = Guid.NewGuid() }; HttpContext.GetService().Set(data.uuid.ToString(), code, new TimeSpan(0, 5, 0)); diff --git "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/ApiInputDomainModel.html" "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/ApiInputDomainModel.html" similarity index 100% rename from ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/ApiInputDomainModel.html" rename to ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/ApiInputDomainModel.html" diff --git "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/ApiOutputDomainModel.html" "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/ApiOutputDomainModel.html" similarity index 100% rename from ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/ApiOutputDomainModel.html" rename to ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/ApiOutputDomainModel.html" diff --git "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/DomainModel.html" "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/DomainModel.html" similarity index 100% rename from ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/DomainModel.html" rename to ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/DomainModel.html" diff --git "a/.Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/MappingConfiguration.html" "b/.Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/MappingConfiguration.html" similarity index 100% rename from ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomianModel/MappingConfiguration.html" rename to ".Net6\347\211\210\346\234\254/VOL.WebApi/Template/DomainModel/MappingConfiguration.html" -- Gitee From 957667dc10bab7b3b958395a47127e3ee906d993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=88=E3=83=BE=E9=AD=82?= <283591387@qq.com> Date: Wed, 19 Apr 2023 07:44:30 +0000 Subject: [PATCH 3/9] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 靈ヾ魂 <283591387@qq.com> --- README.md | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 7d0ce34f..dcddad3c 100644 --- a/README.md +++ b/README.md @@ -40,76 +40,76 @@ - http://v2.volcore.xyz/app/guide ## 框架移动端（uniapp）已发布,同样全自动生成代码,扫描小程序二维码即可查看 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/qrcode.png) +![Home](imgs/qrcode.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/app-01.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/app-02.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m001.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m002.png) +![Home](imgs/app-01.png) +![Home](imgs/app-02.png) +![Home](imgs/m001.png) +![Home](imgs/m002.png) ## 框架已支持Vue3版本 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/v3.png) +![Home](imgs/v3.png) ## 框架已增加低代码设计器 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/fd01.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/fd02.png) +![Home](imgs/fd01.png) +![Home](imgs/fd02.png) ## 框架2.0已更新(部分新增功能截图) 增加切换皮肤功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/h.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/home_them.png) +![Home](imgs/h.png) +![Home](imgs/home_them.png) 增加可复用的后台请求参数校验 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/validator.png) +![Home](imgs/validator.png) 增加树形菜单与代码生成页面使用 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/x7tree.png) +![Home](imgs/x7tree.png) 增加文本编辑器直接发布静态页面功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/editor.png) +![Home](imgs/editor.png) 一对一多从表显示(只需要少量代码就可完成成，其他都由代码生成器生成) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m1.png) +![Home](imgs/m1.png) 表合并显示 (只需要几行代码完成代码生成器生成的页面实现扩展) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/span.png) +![Home](imgs/span.png) 从图上传图片 (只需要几行代码完成代码生成器生成的页面实现扩展) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/p1.png) +![Home](imgs/p1.png) 一对多从表(不限从表数量)扩展 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/multi.png) +![Home](imgs/multi.png) 图表 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/charts.png) +![Home](imgs/charts.png) ## 1、只读基础表单 整个只读的基础表单的所有前后端代码，全部由代码生成器生成，代码生成器中几乎不需要配置，并支持并后端业务代码扩展，直接生成代码后，配置菜单权限即可 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table1.png) +![Home](imgs/table1.png) ## 2、自动绑定下拉框数据表单 整个自动绑定下拉框数据表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，在代码生成器中只需要指定数据源编号，页面加载时会根据编号自动加载数据源并绑定 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table2.png) +![Home](imgs/table2.png) ## 3、启用图片支持、审核表单 整个启用图片支持、审核表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，审核功能需要在菜单配置权限、代码生成器中勾选启用图片支持 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table3.png) +![Home](imgs/table3.png) ## 4、高级查询 整个表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，查询字段、类型(下拉框、日期、TextArea等)、所在行与列都由代码生成器完成，不需要写任何代码 - ![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/tablesearch4.png) + ![Home](imgs/tablesearch4.png) ## 5、主从表新建、编辑 主从表新建、编辑所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，新建、编辑从表配置、字段、类型(下拉框、日期、TextArea等)、所在行与列、字段是否只读、标签显示的长度等都由代码生成器完成，不需要写任何代码 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/editTbale2.png) +![Home](imgs/editTbale2.png) ## 6、excel导入 excel导入整个页面都由代码生成器生成，导入的字段、字段是否必填，下载模板也由代码生成器上配置(自己根据实际需要决定是否采用此方法)，导入时会验证是否为空与数据的合法性，逻辑校验自己实现扩展方法即可 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/importTable1.png) +![Home](imgs/importTable1.png) ## 7、H5开发 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/h5.jpg) +![Home](imgs/h5.jpg) ## 8、权限分配 目前只实现了对用户的角色的Action进行权限分配 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/auth.png) +![Home](imgs/auth.png) ## 9、代码生成器 代码生成器提供了20多种可配置的属性，可灵活配置显示、查询、编辑、导入、导出、主从关系等功能点击看代码生成器文档 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/coder.png) +![Home](imgs/coder.png) 其他功能。。。。。 -- Gitee From a64b66bbe0192709a43286a7bc72d082594cc286 Mon Sep 17 00:00:00 2001 From: xwt Date: Wed, 19 Apr 2023 22:54:34 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feat:=20sql=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=8A=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/Login.vue" | 12 ++++++------ .../src/views/system/Sys_User.vue" | 10 +++++----- .../views/system/quartz/Sys_QuartzLog.vue" | 8 ++++---- .../src/views/treeTable/demo1/Table.vue" | 8 ++++---- .../src/views/treeTable/demo1/table.js" | 2 +- ...6\350\241\250\346\225\260\346\215\256.sql" | 8 ++++---- ...\347\241\200\346\225\260\346\215\256).sql" | 8 ++++---- ...4\344\270\216\346\225\260\346\215\256.sql" | Bin 755942 -> 755858 bytes 8 files changed, 28 insertions(+), 28 deletions(-) diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/Login.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/views/Login.vue" index d9512f82..9e1870d1 100644 --- "a/Vol.Vue3\347\211\210\346\234\254/src/views/Login.vue" +++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/Login.vue" @@ -23,7 +23,7 @@
-
+
@@ -95,13 +95,13 @@ export default defineComponent({ UUID: undefined }); - const getVierificationCode = () => { - http.get('/api/User/getVierificationCode').then((x) => { + const getVerificationCode = () => { + http.get('/api/User/getVerificationCode').then((x) => { codeImgSrc.value = 'data:image/png;base64,' + x.img; userInfo.UUID = x.uuid; }); }; - getVierificationCode(); + getVerificationCode(); let appContext = getCurrentInstance().appContext; let $message = appContext.config.globalProperties.$message; @@ -117,7 +117,7 @@ export default defineComponent({ http.post('/api/user/login', userInfo, '正在登录....').then((result) => { if (!result.status) { loading.value = false; - getVierificationCode(); + getVerificationCode(); return $message.error(result.message); } $message.success('登录成功,正在跳转!'); @@ -136,7 +136,7 @@ export default defineComponent({ return { loading, codeImgSrc, - getVierificationCode, + getVerificationCode, login, userInfo, loginPress, diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/system/Sys_User.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/views/system/Sys_User.vue" index 68f64294..37026626 100644 --- "a/Vol.Vue3\347\211\210\346\234\254/src/views/system/Sys_User.vue" +++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/system/Sys_User.vue" @@ -29,19 +29,19 @@ url: "/Sys_User/", sortName: "User_Id" }); - const editFormFields = ref({"UserName":"","UserTrueName":"","Role_Id":"","IsRegregisterPhone":"","Gender":"","Enable":"","CreateDate":"","Creator":"","Remark":"","HeadImageUrl":""}); + const editFormFields = ref({"UserName":"","UserTrueName":"","Role_Id":"","IsRegisterPhone":"","Gender":"","Enable":"","CreateDate":"","Creator":"","Remark":"","HeadImageUrl":""}); const editFormOptions = ref([[{"title":"帐号","required":true,"field":"UserName","disabled":true}, {"title":"真实姓名","required":true,"field":"UserTrueName","type":"text"}], [{"dataKey":"roles","data":[],"title":"角色","required":true,"field":"Role_Id","type":"select"}, - {"dataKey":"isphone","data":[],"title":"手机用户","required":true,"field":"IsRegregisterPhone","type":"select"}], + {"dataKey":"isphone","data":[],"title":"手机用户","required":true,"field":"IsRegisterPhone","type":"select"}], [{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"}, {"dataKey":"enable","data":[],"title":"是否可用","required":true,"field":"Enable","type":"select"}], [{"title":"注册时间","field":"CreateDate","disabled":true}, {"title":"创建人","field":"Creator","disabled":true}], [{"title":"备注","field":"Remark","colSize":12,"type":"textarea"}], [{"title":"头像","required":true,"field":"HeadImageUrl","type":"img"}]]); - const searchFormFields = ref({"UserName":"","Gender":"","DeptName":"","Role_Id":"","Token":"","AppType":[],"UserTrueName":"","CreateDate":"","IsRegregisterPhone":"","PhoneNo":"","Enable":"","LastLoginDate":"","Address":"","Email":""}); - const searchFormOptions = ref([[{"title":"帐号","field":"UserName"},{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"},{"title":"真实姓名","field":"UserTrueName"}],[{"title":"部门","field":"DeptName"},{"dataKey":"roles","data":[],"title":"角色","field":"Role_Id","type":"select"},{"title":"Token","field":"Token"}],[{"dataKey":"ut","data":[],"title":"登陆设备类型","field":"AppType","type":"selectList"},{"dataKey":"isphone","data":[],"title":"手机用户","field":"IsRegregisterPhone","type":"select"},{"title":"手机号","field":"PhoneNo"}],[{"dataKey":"enable","data":[],"title":"是否可用","field":"Enable","type":"select"},{"title":"地址","field":"Address"},{"title":"Email","field":"Email"}],[{"title":"注册时间","field":"CreateDate","type":"datetime"},{"title":"最后登陆时间","field":"LastLoginDate","type":"datetime"}]]); + const searchFormFields = ref({"UserName":"","Gender":"","DeptName":"","Role_Id":"","Token":"","AppType":[],"UserTrueName":"","CreateDate":"","IsRegisterPhone":"","PhoneNo":"","Enable":"","LastLoginDate":"","Address":"","Email":""}); + const searchFormOptions = ref([[{"title":"帐号","field":"UserName"},{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"},{"title":"真实姓名","field":"UserTrueName"}],[{"title":"部门","field":"DeptName"},{"dataKey":"roles","data":[],"title":"角色","field":"Role_Id","type":"select"},{"title":"Token","field":"Token"}],[{"dataKey":"ut","data":[],"title":"登陆设备类型","field":"AppType","type":"selectList"},{"dataKey":"isphone","data":[],"title":"手机用户","field":"IsRegisterPhone","type":"select"},{"title":"手机号","field":"PhoneNo"}],[{"dataKey":"enable","data":[],"title":"是否可用","field":"Enable","type":"select"},{"title":"地址","field":"Address"},{"title":"Email","field":"Email"}],[{"title":"注册时间","field":"CreateDate","type":"datetime"},{"title":"最后登陆时间","field":"LastLoginDate","type":"datetime"}]]); const columns = ref([{field:'UserName',title:'帐号',type:'string',link:true,width:110,readonly:true,require:true,align:'left',sortable:true}, {field:'User_Id',title:'User_Id',type:'int',width:90,hidden:true,readonly:true,require:true,align:'left'}, {field:'Gender',title:'性别',type:'int',bind:{ key:'gender',data:[]},width:100,align:'left'}, @@ -54,7 +54,7 @@ {field:'AppType',title:'登陆设备类型',type:'int',bind:{ key:'ut',data:[]},width:150,hidden:true,align:'left'}, {field:'UserTrueName',title:'真实姓名',type:'string',width:120,require:true,align:'left'}, {field:'CreateDate',title:'注册时间',type:'datetime',width:150,readonly:true,align:'left',sortable:true}, - {field:'IsRegregisterPhone',title:'手机用户',type:'int',bind:{ key:'isphone',data:[]},width:120,hidden:true,require:true,align:'left'}, + {field:'IsRegisterPhone',title:'手机用户',type:'int',bind:{ key:'isphone',data:[]},width:120,hidden:true,require:true,align:'left'}, {field:'PhoneNo',title:'手机号',type:'string',width:150,hidden:true,require:true,align:'left'}, {field:'Tel',title:'Tel',type:'string',width:90,hidden:true,align:'left'}, {field:'CreateID',title:'CreateID',type:'int',width:90,hidden:true,align:'left'}, diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/system/quartz/Sys_QuartzLog.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/views/system/quartz/Sys_QuartzLog.vue" index 70878cb6..50842bb0 100644 --- "a/Vol.Vue3\347\211\210\346\234\254/src/views/system/quartz/Sys_QuartzLog.vue" +++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/system/quartz/Sys_QuartzLog.vue" @@ -27,17 +27,17 @@ cnName: '执行记录', name: 'quartz/Sys_QuartzLog', url: "/Sys_QuartzLog/", - sortName: "StratDate" + sortName: "StartDate" }); const editFormFields = ref({}); const editFormOptions = ref([]); - const searchFormFields = ref({"TaskName":"","ElapsedTime":[null,null],"StratDate":"","Result":""}); - const searchFormOptions = ref([[{"title":"任务名称","field":"TaskName","type":"like"},{"title":"耗时(秒)","field":"ElapsedTime","type":"range"},{"title":"开始时间","field":"StratDate","type":"datetime"},{"dataKey":"enable","data":[],"title":"是否成功","field":"Result","type":"select"}]]); + const searchFormFields = ref({"TaskName":"","ElapsedTime":[null,null],"StartDate":"","Result":""}); + const searchFormOptions = ref([[{"title":"任务名称","field":"TaskName","type":"like"},{"title":"耗时(秒)","field":"ElapsedTime","type":"range"},{"title":"开始时间","field":"StartDate","type":"datetime"},{"dataKey":"enable","data":[],"title":"是否成功","field":"Result","type":"select"}]]); const columns = ref([{field:'LogId',title:'LogId',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'}, {field:'Id',title:'任务id',type:'guid',width:110,hidden:true,align:'left'}, {field:'TaskName',title:'任务名称',type:'string',width:120,align:'left',sort:true}, {field:'ElapsedTime',title:'耗时(秒)',type:'int',width:90,align:'left'}, - {field:'StratDate',title:'开始时间',type:'datetime',width:150,align:'left',sort:true}, + {field:'StartDate',title:'开始时间',type:'datetime',width:150,align:'left',sort:true}, {field:'EndDate',title:'结束时间',type:'datetime',width:150,align:'left',sort:true}, {field:'Result',title:'是否成功',type:'int',bind:{ key:'enable',data:[]},width:100,align:'left'}, {field:'ResponseContent',title:'返回内容',type:'string',width:250,align:'left'}, diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/treeTable/demo1/Table.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/views/treeTable/demo1/Table.vue" index 25ea20a0..2957ac0b 100644 --- "a/Vol.Vue3\347\211\210\346\234\254/src/views/treeTable/demo1/Table.vue" +++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/treeTable/demo1/Table.vue" @@ -29,18 +29,18 @@ url: "/Sys_User/", sortName: "User_Id" }); - const editFormFields = ref({"UserName":"","UserTrueName":"","Role_Id":"","IsRegregisterPhone":"","Gender":"","Enable":"","CreateDate":"","Creator":"","Remark":"","HeadImageUrl":""}); + const editFormFields = ref({"UserName":"","UserTrueName":"","Role_Id":"","IsRegisterPhone":"","Gender":"","Enable":"","CreateDate":"","Creator":"","Remark":"","HeadImageUrl":""}); const editFormOptions = ref([[{"title":"帐号","required":true,"field":"UserName","disabled":true}, {"title":"真实姓名","required":true,"field":"UserTrueName","type":"text"}], [{"dataKey":"roles","data":[],"title":"角色","required":true,"field":"Role_Id","type":"select"}, - {"dataKey":"isphone","data":[],"title":"手机用户","required":true,"field":"IsRegregisterPhone","type":"select"}], + {"dataKey":"isphone","data":[],"title":"手机用户","required":true,"field":"IsRegisterPhone","type":"select"}], [{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"}, {"dataKey":"enable","data":[],"title":"是否可用","required":true,"field":"Enable","type":"select"}], [{"title":"备注","field":"Remark","colSize":12,"type":"textarea"}], [{"title":"头像","required":true,"field":"HeadImageUrl","type":"img"}]]); - const searchFormFields = ref({"UserName":"","Gender":"","DeptName":"","Role_Id":"","Token":"","AppType":[],"UserTrueName":"","CreateDate":"","IsRegregisterPhone":"","PhoneNo":"","Enable":"","LastLoginDate":"","Address":"","Email":""}); - const searchFormOptions = ref([[{"title":"帐号","field":"UserName"},{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"},{"title":"真实姓名","field":"UserTrueName"}],[{"title":"部门","field":"DeptName"},{"dataKey":"roles","data":[],"title":"角色","field":"Role_Id","type":"select"},{"title":"Token","field":"Token"}],[{"dataKey":"ut","data":[],"title":"登陆设备类型","field":"AppType","type":"selectList"},{"dataKey":"isphone","data":[],"title":"手机用户","field":"IsRegregisterPhone","type":"select"},{"title":"手机号","field":"PhoneNo"}],[{"dataKey":"enable","data":[],"title":"是否可用","field":"Enable","type":"select"},{"title":"地址","field":"Address"},{"title":"Email","field":"Email"}],[{"title":"注册时间","field":"CreateDate","type":"datetime"},{"title":"最后登陆时间","field":"LastLoginDate","type":"datetime"}]]); + const searchFormFields = ref({"UserName":"","Gender":"","DeptName":"","Role_Id":"","Token":"","AppType":[],"UserTrueName":"","CreateDate":"","IsRegisterPhone":"","PhoneNo":"","Enable":"","LastLoginDate":"","Address":"","Email":""}); + const searchFormOptions = ref([[{"title":"帐号","field":"UserName"},{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"},{"title":"真实姓名","field":"UserTrueName"}],[{"title":"部门","field":"DeptName"},{"dataKey":"roles","data":[],"title":"角色","field":"Role_Id","type":"select"},{"title":"Token","field":"Token"}],[{"dataKey":"ut","data":[],"title":"登陆设备类型","field":"AppType","type":"selectList"},{"dataKey":"isphone","data":[],"title":"手机用户","field":"IsRegisterPhone","type":"select"},{"title":"手机号","field":"PhoneNo"}],[{"dataKey":"enable","data":[],"title":"是否可用","field":"Enable","type":"select"},{"title":"地址","field":"Address"},{"title":"Email","field":"Email"}],[{"title":"注册时间","field":"CreateDate","type":"datetime"},{"title":"最后登陆时间","field":"LastLoginDate","type":"datetime"}]]); const columns = ref([{field:'UserName',title:'帐号',type:'string',link:true,width:110,readonly:true,require:true,align:'left',sortable:true}, {field:'User_Id',title:'User_Id',type:'int',width:90,hidden:true,readonly:true,require:true,align:'left'}, {field:'Gender',title:'性别',type:'int',bind:{ key:'gender',data:[]},width:100,align:'left'}, diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/treeTable/demo1/table.js" "b/Vol.Vue3\347\211\210\346\234\254/src/views/treeTable/demo1/table.js" index e20ef0af..43ffcde4 100644 --- "a/Vol.Vue3\347\211\210\346\234\254/src/views/treeTable/demo1/table.js" +++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/treeTable/demo1/table.js" @@ -58,7 +58,7 @@ let extension = { //添加默认新建的值到后台 //新建用户的角色默认为当前树形菜单选中的角色 param.mainData.Role_Id = treeId; - param.mainData.IsRegregisterPhone = 0; + param.mainData.IsRegisterPhone = 0; return true; }, addAfter(result) {//用户新建后，显示随机生成的密码 diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" index 6bfaf814..56ea1ae1 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" @@ -614,7 +614,7 @@ INSERT INTO `Sys_Dictionary` VALUES (48, '{\n valueField: \'ClassifyId\',\n text INSERT INTO `Sys_Dictionary` VALUES (49, '{\n valueField: \'Gender\',\n textField: \'Gender\',\n containField:null \n}', '2018-07-23 10:04:45', NULL, '测试超级管理员', NULL, NULL, '性别', 'gender', 1, '测试超级管理员', '2018-07-23 11:10:28', 1, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (50, '{\n valueField: \'Enable\',\n textField: \'Enable\',\n containField:null \n}', '2018-07-23 15:36:43', 1, '测试超级管理员', NULL, NULL, '启用状态', 'status', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (52, '{\n valueField: \'Choiceness\',\n textField: \'Choiceness\',\n containField:null \n}', '2018-07-24 15:45:47', 1, '测试超级管理员', NULL, NULL, '是否买入', 'cq', 1, '超级管理员', '2022-03-26 23:07:16', 1, NULL, 0, NULL); -INSERT INTO `Sys_Dictionary` VALUES (59, '{\n valueField: \'IsRegregisterPhone\',\n textField: \'IsRegregisterPhone\',\n containField:null \n}', '2018-08-29 15:54:21', 1, '测试超级管理员', NULL, NULL, 'test', 'isphone', 1, '超级管理员', '2020-12-19 18:02:55', 1, NULL, 0, NULL); +INSERT INTO `Sys_Dictionary` VALUES (59, '{\n valueField: \'IsRegisterPhone\',\n textField: \'IsRegisterPhone\',\n containField:null \n}', '2018-08-29 15:54:21', 1, '测试超级管理员', NULL, NULL, 'test', 'isphone', 1, '超级管理员', '2020-12-19 18:02:55', 1, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (62, '{\n valueField: \'IsTop\',\n textField: \'IsTop\',\n containField:null \n}', '2019-08-20 09:57:54', 1, '超级管理员', NULL, NULL, 'test1', 'top', 1, '超级管理员', '2022-01-03 19:13:37', 1, NULL, 1, 'dddd'); INSERT INTO `Sys_Dictionary` VALUES (64, NULL, '2019-09-18 19:25:47', 1, '超级管理员', NULL, NULL, '订单类型', 'ordertype', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (65, NULL, '2019-09-19 10:07:23', 1, '超级管理员', NULL, NULL, '商品名称', 'pn', 1, '超级管理员', '2022-07-12 10:55:23', 1, NULL, 0, NULL); @@ -913,7 +913,7 @@ CREATE TABLE `Sys_QuartzLog` ( `Id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `TaskName` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `ElapsedTime` int(11) NULL DEFAULT NULL, - `StratDate` datetime(0) NULL DEFAULT NULL, + `StartDate` datetime(0) NULL DEFAULT NULL, `EndDate` datetime(0) NULL DEFAULT NULL, `Result` int(11) NULL DEFAULT NULL, `ResponseContent` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, @@ -1294,7 +1294,7 @@ INSERT INTO `Sys_TableColumn` VALUES (429, 1, 0, NULL, NULL, '手机号', 'Phone INSERT INTO `Sys_TableColumn` VALUES (431, NULL, NULL, NULL, NULL, 'Token', 'Token', 'string', 180, '', NULL, NULL, NULL, '', NULL, 4, '', NULL, 1, 1, NULL, NULL, 1, 0, 500, '超级管理员', '2021-04-12 23:04:26', 1, 7810, '', NULL, 2, '', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (506, NULL, NULL, NULL, NULL, '性别', 'Gender', 'int', 100, '', NULL, NULL, NULL, 'gender', NULL, 4, 'drop', NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7843, '', NULL, 1, 'drop', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (654, NULL, NULL, NULL, NULL, '登陆设备类型', 'AppType', 'int', 150, '', NULL, NULL, NULL, 'ut', NULL, 0, '', NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7809, '', NULL, 3, 'dropList', 0, 'Sys_User', 6); -INSERT INTO `Sys_TableColumn` VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegregisterPhone', 'int', 120, '', NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7771, '', NULL, 3, 'drop', 0, 'Sys_User', 6); +INSERT INTO `Sys_TableColumn` VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegisterPhone', 'int', 120, '', NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7771, '', NULL, 3, 'drop', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (764, NULL, NULL, NULL, NULL, '', 'FormId', 'string', 110, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 0, NULL, 1, 0, 1, 36, '超级管理员', '2022-01-03 19:28:41', 1, 1150, NULL, NULL, NULL, NULL, 0, 'FormDesignOptions', 84); INSERT INTO `Sys_TableColumn` VALUES (765, NULL, NULL, NULL, NULL, '表单名称', 'Title', 'string', 220, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, 1, NULL, NULL, 1, 1, NULL, 0, 0, 0, 500, '超级管理员', '2022-01-03 19:28:41', 1, 1100, NULL, NULL, 1, 'like', 0, 'FormDesignOptions', 84); INSERT INTO `Sys_TableColumn` VALUES (766, NULL, NULL, NULL, NULL, '设计器配置', 'DaraggeOptions', 'string', 110, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 1, NULL, 0, 1, 0, 0, '超级管理员', '2022-01-03 19:28:41', 1, 1050, NULL, NULL, NULL, NULL, 0, 'FormDesignOptions', 84); @@ -1451,7 +1451,7 @@ CREATE TABLE `Sys_User` ( `Enable` tinyint(4) NOT NULL, `Gender` int(1) NULL DEFAULT NULL, `HeadImageUrl` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `IsRegregisterPhone` int(11) NOT NULL, + `IsRegisterPhone` int(11) NOT NULL, `LastLoginDate` datetime(0) NULL DEFAULT NULL, `LastModifyPwdDate` datetime(0) NULL DEFAULT NULL, `Mobile` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" index acf7cde1..cf4686f5 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" @@ -709,8 +709,8 @@ INSERT INTO "public"."Sys_Dictionary" VALUES (53, '{ containField:null }', NULL, 1, '测试超级管理员', NULL, NULL, '图片来源', 'ps', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO "public"."Sys_Dictionary" VALUES (59, '{ - valueField: ''IsRegregisterPhone'', - textField: ''IsRegregisterPhone'', + valueField: ''IsRegisterPhone'', + textField: ''IsRegisterPhone'', containField:null }', NULL, 1, '测试超级管理员', NULL, NULL, '是否手机用户', 'isphone', 1, '超级管理员', NULL, 1, NULL, 0, NULL); INSERT INTO "public"."Sys_Dictionary" VALUES (60, '{ @@ -1432,7 +1432,7 @@ INSERT INTO "public"."Sys_TableColumn" VALUES (550, NULL, NULL, NULL, NULL, '申 INSERT INTO "public"."Sys_TableColumn" VALUES (551, NULL, NULL, NULL, NULL, '申请人帐号', 'UserName', 'string', 120, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, 30, '超级管理员', '2019-09-18 16:46:51', 1, 7920, NULL, NULL, NULL, NULL, NULL, 'App_Expert', 20); INSERT INTO "public"."Sys_TableColumn" VALUES (552, NULL, NULL, NULL, NULL, '申请人', 'UserTrueName', 'string', 120, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, 50, '超级管理员', '2019-09-18 16:46:51', 1, 7920, NULL, NULL, NULL, NULL, NULL, 'App_Expert', 20); INSERT INTO "public"."Sys_TableColumn" VALUES (654, NULL, NULL, NULL, NULL, '登陆设备类型', 'AppType', 'int', 150, NULL, NULL, NULL, NULL, 'ut', NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7809, NULL, NULL, 3, 'dropList', NULL, 'Sys_User', 6); -INSERT INTO "public"."Sys_TableColumn" VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegregisterPhone', 'int', 120, NULL, NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7771, NULL, NULL, 3, 'drop', NULL, 'Sys_User', 6); +INSERT INTO "public"."Sys_TableColumn" VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegisterPhone', 'int', 120, NULL, NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7771, NULL, NULL, 3, 'drop', NULL, 'Sys_User', 6); INSERT INTO "public"."Sys_TableColumn" VALUES (663, NULL, NULL, NULL, NULL, '是否今日推荐', 'DailyRecommend', 'sbyte', 120, NULL, NULL, NULL, NULL, 'dr', NULL, 5, 'drop', NULL, 1, 1, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-08-16 09:31:10', 1, 6825, NULL, NULL, 1, 'drop', NULL, 'App_News', 28); INSERT INTO "public"."Sys_TableColumn" VALUES (664, NULL, NULL, NULL, NULL, '推荐排序', 'OrderNo', 'int', 120, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2019-08-16 09:31:10', 1, 6822, NULL, NULL, NULL, '无', NULL, 'App_News', 28); INSERT INTO "public"."Sys_TableColumn" VALUES (714, NULL, NULL, NULL, NULL, 'Id', 'Order_Id', 'string', 90, NULL, '2019-08-22 17:26:55', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 0, NULL, 1, 0, 1, 36, '超级管理员', '2019-09-19 14:55:02', 1, 2850, NULL, NULL, NULL, NULL, NULL, 'SellOrder', 77); @@ -1619,7 +1619,7 @@ CREATE TABLE "public"."Sys_User" ( "Enable" int2 NOT NULL, "Gender" int4, "HeadImageUrl" varchar(200) COLLATE "pg_catalog"."default", - "IsRegregisterPhone" int4 NOT NULL, + "IsRegisterPhone" int4 NOT NULL, "LastLoginDate" timestamp(6), "LastModifyPwdDate" timestamp(6), "Mobile" varchar(100) COLLATE "pg_catalog"."default", diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/sqlserver/\350\241\250\347\273\223\346\236\204\344\270\216\346\225\260\346\215\256.sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/sqlserver/\350\241\250\347\273\223\346\236\204\344\270\216\346\225\260\346\215\256.sql" index 201db807bef7cc07d47bf5400d30d735e054b6ce..72d66cc18e01b65428235ad22004586facdfc4bc 100644 GIT binary patch delta 303 zcmaDhQE$>jy$u!l%!v#|lN%SCPuk70d0T#kQM1XSc9TVnK+Lq=WD&D~P0cLMu g1?kzwxLrk?dy_IN(ESW0)AiH2XKyd_=Ps}W0P|0BF#rGn delta 339 zcmbOZZn@#3D zOybxo_V#0|IJO^K#ra|xGtm0&8w0trXM$MMfh^JK30Jr{rYF4SlA7N2oJ(x_1S>9{ z>GL*oDNRdav75eN375q753jidm>7$;1D&~@aryxxCa&#!-g6nTLxlD+ZeR9;>kb>7 zXT`{^gy4yAaxY?r$n9o@t5Ff*{sR+b+k0Dd!lEdT%j -- Gitee From 21fef8b93ded5fe9c8bc17e257144598e6c4fe01 Mon Sep 17 00:00:00 2001 From: xwt Date: Wed, 19 Apr 2023 23:23:44 +0800 Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E7=89=88.net6=E5=92=8Cvue3=E5=AF=B9=E5=BA=94=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...6\350\241\250\346\225\260\346\215\256.sql" | 8 ++++---- ...\347\241\200\346\225\260\346\215\256).sql" | 8 ++++---- ...4\344\270\216\346\225\260\346\215\256.sql" | Bin 755858 -> 755942 bytes .../src/views/Login.vue" | 12 ++++++------ .../src/views/system/Sys_User.vue" | 10 +++++----- .../views/system/quartz/Sys_QuartzLog.vue" | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" index 56ea1ae1..6bfaf814 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" @@ -614,7 +614,7 @@ INSERT INTO `Sys_Dictionary` VALUES (48, '{\n valueField: \'ClassifyId\',\n text INSERT INTO `Sys_Dictionary` VALUES (49, '{\n valueField: \'Gender\',\n textField: \'Gender\',\n containField:null \n}', '2018-07-23 10:04:45', NULL, '测试超级管理员', NULL, NULL, '性别', 'gender', 1, '测试超级管理员', '2018-07-23 11:10:28', 1, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (50, '{\n valueField: \'Enable\',\n textField: \'Enable\',\n containField:null \n}', '2018-07-23 15:36:43', 1, '测试超级管理员', NULL, NULL, '启用状态', 'status', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (52, '{\n valueField: \'Choiceness\',\n textField: \'Choiceness\',\n containField:null \n}', '2018-07-24 15:45:47', 1, '测试超级管理员', NULL, NULL, '是否买入', 'cq', 1, '超级管理员', '2022-03-26 23:07:16', 1, NULL, 0, NULL); -INSERT INTO `Sys_Dictionary` VALUES (59, '{\n valueField: \'IsRegisterPhone\',\n textField: \'IsRegisterPhone\',\n containField:null \n}', '2018-08-29 15:54:21', 1, '测试超级管理员', NULL, NULL, 'test', 'isphone', 1, '超级管理员', '2020-12-19 18:02:55', 1, NULL, 0, NULL); +INSERT INTO `Sys_Dictionary` VALUES (59, '{\n valueField: \'IsRegregisterPhone\',\n textField: \'IsRegregisterPhone\',\n containField:null \n}', '2018-08-29 15:54:21', 1, '测试超级管理员', NULL, NULL, 'test', 'isphone', 1, '超级管理员', '2020-12-19 18:02:55', 1, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (62, '{\n valueField: \'IsTop\',\n textField: \'IsTop\',\n containField:null \n}', '2019-08-20 09:57:54', 1, '超级管理员', NULL, NULL, 'test1', 'top', 1, '超级管理员', '2022-01-03 19:13:37', 1, NULL, 1, 'dddd'); INSERT INTO `Sys_Dictionary` VALUES (64, NULL, '2019-09-18 19:25:47', 1, '超级管理员', NULL, NULL, '订单类型', 'ordertype', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (65, NULL, '2019-09-19 10:07:23', 1, '超级管理员', NULL, NULL, '商品名称', 'pn', 1, '超级管理员', '2022-07-12 10:55:23', 1, NULL, 0, NULL); @@ -913,7 +913,7 @@ CREATE TABLE `Sys_QuartzLog` ( `Id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `TaskName` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `ElapsedTime` int(11) NULL DEFAULT NULL, - `StartDate` datetime(0) NULL DEFAULT NULL, + `StratDate` datetime(0) NULL DEFAULT NULL, `EndDate` datetime(0) NULL DEFAULT NULL, `Result` int(11) NULL DEFAULT NULL, `ResponseContent` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, @@ -1294,7 +1294,7 @@ INSERT INTO `Sys_TableColumn` VALUES (429, 1, 0, NULL, NULL, '手机号', 'Phone INSERT INTO `Sys_TableColumn` VALUES (431, NULL, NULL, NULL, NULL, 'Token', 'Token', 'string', 180, '', NULL, NULL, NULL, '', NULL, 4, '', NULL, 1, 1, NULL, NULL, 1, 0, 500, '超级管理员', '2021-04-12 23:04:26', 1, 7810, '', NULL, 2, '', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (506, NULL, NULL, NULL, NULL, '性别', 'Gender', 'int', 100, '', NULL, NULL, NULL, 'gender', NULL, 4, 'drop', NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7843, '', NULL, 1, 'drop', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (654, NULL, NULL, NULL, NULL, '登陆设备类型', 'AppType', 'int', 150, '', NULL, NULL, NULL, 'ut', NULL, 0, '', NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7809, '', NULL, 3, 'dropList', 0, 'Sys_User', 6); -INSERT INTO `Sys_TableColumn` VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegisterPhone', 'int', 120, '', NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7771, '', NULL, 3, 'drop', 0, 'Sys_User', 6); +INSERT INTO `Sys_TableColumn` VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegregisterPhone', 'int', 120, '', NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7771, '', NULL, 3, 'drop', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (764, NULL, NULL, NULL, NULL, '', 'FormId', 'string', 110, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 0, NULL, 1, 0, 1, 36, '超级管理员', '2022-01-03 19:28:41', 1, 1150, NULL, NULL, NULL, NULL, 0, 'FormDesignOptions', 84); INSERT INTO `Sys_TableColumn` VALUES (765, NULL, NULL, NULL, NULL, '表单名称', 'Title', 'string', 220, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, 1, NULL, NULL, 1, 1, NULL, 0, 0, 0, 500, '超级管理员', '2022-01-03 19:28:41', 1, 1100, NULL, NULL, 1, 'like', 0, 'FormDesignOptions', 84); INSERT INTO `Sys_TableColumn` VALUES (766, NULL, NULL, NULL, NULL, '设计器配置', 'DaraggeOptions', 'string', 110, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 1, NULL, 0, 1, 0, 0, '超级管理员', '2022-01-03 19:28:41', 1, 1050, NULL, NULL, NULL, NULL, 0, 'FormDesignOptions', 84); @@ -1451,7 +1451,7 @@ CREATE TABLE `Sys_User` ( `Enable` tinyint(4) NOT NULL, `Gender` int(1) NULL DEFAULT NULL, `HeadImageUrl` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `IsRegisterPhone` int(11) NOT NULL, + `IsRegregisterPhone` int(11) NOT NULL, `LastLoginDate` datetime(0) NULL DEFAULT NULL, `LastModifyPwdDate` datetime(0) NULL DEFAULT NULL, `Mobile` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" index cf4686f5..acf7cde1 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" @@ -709,8 +709,8 @@ INSERT INTO "public"."Sys_Dictionary" VALUES (53, '{ containField:null }', NULL, 1, '测试超级管理员', NULL, NULL, '图片来源', 'ps', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO "public"."Sys_Dictionary" VALUES (59, '{ - valueField: ''IsRegisterPhone'', - textField: ''IsRegisterPhone'', + valueField: ''IsRegregisterPhone'', + textField: ''IsRegregisterPhone'', containField:null }', NULL, 1, '测试超级管理员', NULL, NULL, '是否手机用户', 'isphone', 1, '超级管理员', NULL, 1, NULL, 0, NULL); INSERT INTO "public"."Sys_Dictionary" VALUES (60, '{ @@ -1432,7 +1432,7 @@ INSERT INTO "public"."Sys_TableColumn" VALUES (550, NULL, NULL, NULL, NULL, '申 INSERT INTO "public"."Sys_TableColumn" VALUES (551, NULL, NULL, NULL, NULL, '申请人帐号', 'UserName', 'string', 120, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, 30, '超级管理员', '2019-09-18 16:46:51', 1, 7920, NULL, NULL, NULL, NULL, NULL, 'App_Expert', 20); INSERT INTO "public"."Sys_TableColumn" VALUES (552, NULL, NULL, NULL, NULL, '申请人', 'UserTrueName', 'string', 120, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, 50, '超级管理员', '2019-09-18 16:46:51', 1, 7920, NULL, NULL, NULL, NULL, NULL, 'App_Expert', 20); INSERT INTO "public"."Sys_TableColumn" VALUES (654, NULL, NULL, NULL, NULL, '登陆设备类型', 'AppType', 'int', 150, NULL, NULL, NULL, NULL, 'ut', NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7809, NULL, NULL, 3, 'dropList', NULL, 'Sys_User', 6); -INSERT INTO "public"."Sys_TableColumn" VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegisterPhone', 'int', 120, NULL, NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7771, NULL, NULL, 3, 'drop', NULL, 'Sys_User', 6); +INSERT INTO "public"."Sys_TableColumn" VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegregisterPhone', 'int', 120, NULL, NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7771, NULL, NULL, 3, 'drop', NULL, 'Sys_User', 6); INSERT INTO "public"."Sys_TableColumn" VALUES (663, NULL, NULL, NULL, NULL, '是否今日推荐', 'DailyRecommend', 'sbyte', 120, NULL, NULL, NULL, NULL, 'dr', NULL, 5, 'drop', NULL, 1, 1, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-08-16 09:31:10', 1, 6825, NULL, NULL, 1, 'drop', NULL, 'App_News', 28); INSERT INTO "public"."Sys_TableColumn" VALUES (664, NULL, NULL, NULL, NULL, '推荐排序', 'OrderNo', 'int', 120, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2019-08-16 09:31:10', 1, 6822, NULL, NULL, NULL, '无', NULL, 'App_News', 28); INSERT INTO "public"."Sys_TableColumn" VALUES (714, NULL, NULL, NULL, NULL, 'Id', 'Order_Id', 'string', 90, NULL, '2019-08-22 17:26:55', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 0, NULL, 1, 0, 1, 36, '超级管理员', '2019-09-19 14:55:02', 1, 2850, NULL, NULL, NULL, NULL, NULL, 'SellOrder', 77); @@ -1619,7 +1619,7 @@ CREATE TABLE "public"."Sys_User" ( "Enable" int2 NOT NULL, "Gender" int4, "HeadImageUrl" varchar(200) COLLATE "pg_catalog"."default", - "IsRegisterPhone" int4 NOT NULL, + "IsRegregisterPhone" int4 NOT NULL, "LastLoginDate" timestamp(6), "LastModifyPwdDate" timestamp(6), "Mobile" varchar(100) COLLATE "pg_catalog"."default", diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/sqlserver/\350\241\250\347\273\223\346\236\204\344\270\216\346\225\260\346\215\256.sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/sqlserver/\350\241\250\347\273\223\346\236\204\344\270\216\346\225\260\346\215\256.sql" index 72d66cc18e01b65428235ad22004586facdfc4bc..201db807bef7cc07d47bf5400d30d735e054b6ce 100644 GIT binary patch delta 339 zcmbOZZn@#3D zOybxo_V#0|IJO^K#ra|xGtm0&8w0trXM$MMfh^JK30Jr{rYF4SlA7N2oJ(x_1S>9{ z>GL*oDNRdav75eN375q753jidm>7$;1D&~@aryxxCa&#!-g6nTLxlD+ZeR9;>kb>7 zXT`{^gy4yAaxY?r$n9o@t5Ff*{sR+b+k0Dd!lEdT%j delta 303 zcmaDhQE$>jy$u!l%!v#|lN%SCPuk70d0T#kQM1XSc9TVnK+Lq=WD&D~P0cLMu g1?kzwxLrk?dy_IN(ESW0)AiH2XKyd_=Ps}W0P|0BF#rGn diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/Login.vue" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/Login.vue" index d9512f82..9e1870d1 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/Login.vue" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/Login.vue" @@ -23,7 +23,7 @@
-
+
@@ -95,13 +95,13 @@ export default defineComponent({ UUID: undefined }); - const getVierificationCode = () => { - http.get('/api/User/getVierificationCode').then((x) => { + const getVerificationCode = () => { + http.get('/api/User/getVerificationCode').then((x) => { codeImgSrc.value = 'data:image/png;base64,' + x.img; userInfo.UUID = x.uuid; }); }; - getVierificationCode(); + getVerificationCode(); let appContext = getCurrentInstance().appContext; let $message = appContext.config.globalProperties.$message; @@ -117,7 +117,7 @@ export default defineComponent({ http.post('/api/user/login', userInfo, '正在登录....').then((result) => { if (!result.status) { loading.value = false; - getVierificationCode(); + getVerificationCode(); return $message.error(result.message); } $message.success('登录成功,正在跳转!'); @@ -136,7 +136,7 @@ export default defineComponent({ return { loading, codeImgSrc, - getVierificationCode, + getVerificationCode, login, userInfo, loginPress, diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/system/Sys_User.vue" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/system/Sys_User.vue" index 68f64294..37026626 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/system/Sys_User.vue" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/system/Sys_User.vue" @@ -29,19 +29,19 @@ url: "/Sys_User/", sortName: "User_Id" }); - const editFormFields = ref({"UserName":"","UserTrueName":"","Role_Id":"","IsRegregisterPhone":"","Gender":"","Enable":"","CreateDate":"","Creator":"","Remark":"","HeadImageUrl":""}); + const editFormFields = ref({"UserName":"","UserTrueName":"","Role_Id":"","IsRegisterPhone":"","Gender":"","Enable":"","CreateDate":"","Creator":"","Remark":"","HeadImageUrl":""}); const editFormOptions = ref([[{"title":"帐号","required":true,"field":"UserName","disabled":true}, {"title":"真实姓名","required":true,"field":"UserTrueName","type":"text"}], [{"dataKey":"roles","data":[],"title":"角色","required":true,"field":"Role_Id","type":"select"}, - {"dataKey":"isphone","data":[],"title":"手机用户","required":true,"field":"IsRegregisterPhone","type":"select"}], + {"dataKey":"isphone","data":[],"title":"手机用户","required":true,"field":"IsRegisterPhone","type":"select"}], [{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"}, {"dataKey":"enable","data":[],"title":"是否可用","required":true,"field":"Enable","type":"select"}], [{"title":"注册时间","field":"CreateDate","disabled":true}, {"title":"创建人","field":"Creator","disabled":true}], [{"title":"备注","field":"Remark","colSize":12,"type":"textarea"}], [{"title":"头像","required":true,"field":"HeadImageUrl","type":"img"}]]); - const searchFormFields = ref({"UserName":"","Gender":"","DeptName":"","Role_Id":"","Token":"","AppType":[],"UserTrueName":"","CreateDate":"","IsRegregisterPhone":"","PhoneNo":"","Enable":"","LastLoginDate":"","Address":"","Email":""}); - const searchFormOptions = ref([[{"title":"帐号","field":"UserName"},{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"},{"title":"真实姓名","field":"UserTrueName"}],[{"title":"部门","field":"DeptName"},{"dataKey":"roles","data":[],"title":"角色","field":"Role_Id","type":"select"},{"title":"Token","field":"Token"}],[{"dataKey":"ut","data":[],"title":"登陆设备类型","field":"AppType","type":"selectList"},{"dataKey":"isphone","data":[],"title":"手机用户","field":"IsRegregisterPhone","type":"select"},{"title":"手机号","field":"PhoneNo"}],[{"dataKey":"enable","data":[],"title":"是否可用","field":"Enable","type":"select"},{"title":"地址","field":"Address"},{"title":"Email","field":"Email"}],[{"title":"注册时间","field":"CreateDate","type":"datetime"},{"title":"最后登陆时间","field":"LastLoginDate","type":"datetime"}]]); + const searchFormFields = ref({"UserName":"","Gender":"","DeptName":"","Role_Id":"","Token":"","AppType":[],"UserTrueName":"","CreateDate":"","IsRegisterPhone":"","PhoneNo":"","Enable":"","LastLoginDate":"","Address":"","Email":""}); + const searchFormOptions = ref([[{"title":"帐号","field":"UserName"},{"dataKey":"gender","data":[],"title":"性别","field":"Gender","type":"select"},{"title":"真实姓名","field":"UserTrueName"}],[{"title":"部门","field":"DeptName"},{"dataKey":"roles","data":[],"title":"角色","field":"Role_Id","type":"select"},{"title":"Token","field":"Token"}],[{"dataKey":"ut","data":[],"title":"登陆设备类型","field":"AppType","type":"selectList"},{"dataKey":"isphone","data":[],"title":"手机用户","field":"IsRegisterPhone","type":"select"},{"title":"手机号","field":"PhoneNo"}],[{"dataKey":"enable","data":[],"title":"是否可用","field":"Enable","type":"select"},{"title":"地址","field":"Address"},{"title":"Email","field":"Email"}],[{"title":"注册时间","field":"CreateDate","type":"datetime"},{"title":"最后登陆时间","field":"LastLoginDate","type":"datetime"}]]); const columns = ref([{field:'UserName',title:'帐号',type:'string',link:true,width:110,readonly:true,require:true,align:'left',sortable:true}, {field:'User_Id',title:'User_Id',type:'int',width:90,hidden:true,readonly:true,require:true,align:'left'}, {field:'Gender',title:'性别',type:'int',bind:{ key:'gender',data:[]},width:100,align:'left'}, @@ -54,7 +54,7 @@ {field:'AppType',title:'登陆设备类型',type:'int',bind:{ key:'ut',data:[]},width:150,hidden:true,align:'left'}, {field:'UserTrueName',title:'真实姓名',type:'string',width:120,require:true,align:'left'}, {field:'CreateDate',title:'注册时间',type:'datetime',width:150,readonly:true,align:'left',sortable:true}, - {field:'IsRegregisterPhone',title:'手机用户',type:'int',bind:{ key:'isphone',data:[]},width:120,hidden:true,require:true,align:'left'}, + {field:'IsRegisterPhone',title:'手机用户',type:'int',bind:{ key:'isphone',data:[]},width:120,hidden:true,require:true,align:'left'}, {field:'PhoneNo',title:'手机号',type:'string',width:150,hidden:true,require:true,align:'left'}, {field:'Tel',title:'Tel',type:'string',width:90,hidden:true,align:'left'}, {field:'CreateID',title:'CreateID',type:'int',width:90,hidden:true,align:'left'}, diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/system/quartz/Sys_QuartzLog.vue" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/system/quartz/Sys_QuartzLog.vue" index 70878cb6..50842bb0 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/system/quartz/Sys_QuartzLog.vue" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/Vol.Vue3\347\211\210\346\234\254/src/views/system/quartz/Sys_QuartzLog.vue" @@ -27,17 +27,17 @@ cnName: '执行记录', name: 'quartz/Sys_QuartzLog', url: "/Sys_QuartzLog/", - sortName: "StratDate" + sortName: "StartDate" }); const editFormFields = ref({}); const editFormOptions = ref([]); - const searchFormFields = ref({"TaskName":"","ElapsedTime":[null,null],"StratDate":"","Result":""}); - const searchFormOptions = ref([[{"title":"任务名称","field":"TaskName","type":"like"},{"title":"耗时(秒)","field":"ElapsedTime","type":"range"},{"title":"开始时间","field":"StratDate","type":"datetime"},{"dataKey":"enable","data":[],"title":"是否成功","field":"Result","type":"select"}]]); + const searchFormFields = ref({"TaskName":"","ElapsedTime":[null,null],"StartDate":"","Result":""}); + const searchFormOptions = ref([[{"title":"任务名称","field":"TaskName","type":"like"},{"title":"耗时(秒)","field":"ElapsedTime","type":"range"},{"title":"开始时间","field":"StartDate","type":"datetime"},{"dataKey":"enable","data":[],"title":"是否成功","field":"Result","type":"select"}]]); const columns = ref([{field:'LogId',title:'LogId',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'}, {field:'Id',title:'任务id',type:'guid',width:110,hidden:true,align:'left'}, {field:'TaskName',title:'任务名称',type:'string',width:120,align:'left',sort:true}, {field:'ElapsedTime',title:'耗时(秒)',type:'int',width:90,align:'left'}, - {field:'StratDate',title:'开始时间',type:'datetime',width:150,align:'left',sort:true}, + {field:'StartDate',title:'开始时间',type:'datetime',width:150,align:'left',sort:true}, {field:'EndDate',title:'结束时间',type:'datetime',width:150,align:'left',sort:true}, {field:'Result',title:'是否成功',type:'int',bind:{ key:'enable',data:[]},width:100,align:'left'}, {field:'ResponseContent',title:'返回内容',type:'string',width:250,align:'left'}, -- Gitee From ddd4af037f73f43bba986d333f594fef693fadc6 Mon Sep 17 00:00:00 2001 From: xwt Date: Thu, 20 Apr 2023 00:13:32 +0800 Subject: [PATCH 6/9] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0sql=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...6\350\241\250\346\225\260\346\215\256.sql" | 8 ++++---- ...\347\241\200\346\225\260\346\215\256).sql" | 8 ++++---- ...4\344\270\216\346\225\260\346\215\256.sql" | Bin 755942 -> 755858 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" index 6bfaf814..56ea1ae1 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/mysql/mysql\350\241\250\347\273\223\346\236\204\344\270\216\350\241\250\346\225\260\346\215\256.sql" @@ -614,7 +614,7 @@ INSERT INTO `Sys_Dictionary` VALUES (48, '{\n valueField: \'ClassifyId\',\n text INSERT INTO `Sys_Dictionary` VALUES (49, '{\n valueField: \'Gender\',\n textField: \'Gender\',\n containField:null \n}', '2018-07-23 10:04:45', NULL, '测试超级管理员', NULL, NULL, '性别', 'gender', 1, '测试超级管理员', '2018-07-23 11:10:28', 1, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (50, '{\n valueField: \'Enable\',\n textField: \'Enable\',\n containField:null \n}', '2018-07-23 15:36:43', 1, '测试超级管理员', NULL, NULL, '启用状态', 'status', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (52, '{\n valueField: \'Choiceness\',\n textField: \'Choiceness\',\n containField:null \n}', '2018-07-24 15:45:47', 1, '测试超级管理员', NULL, NULL, '是否买入', 'cq', 1, '超级管理员', '2022-03-26 23:07:16', 1, NULL, 0, NULL); -INSERT INTO `Sys_Dictionary` VALUES (59, '{\n valueField: \'IsRegregisterPhone\',\n textField: \'IsRegregisterPhone\',\n containField:null \n}', '2018-08-29 15:54:21', 1, '测试超级管理员', NULL, NULL, 'test', 'isphone', 1, '超级管理员', '2020-12-19 18:02:55', 1, NULL, 0, NULL); +INSERT INTO `Sys_Dictionary` VALUES (59, '{\n valueField: \'IsRegisterPhone\',\n textField: \'IsRegisterPhone\',\n containField:null \n}', '2018-08-29 15:54:21', 1, '测试超级管理员', NULL, NULL, 'test', 'isphone', 1, '超级管理员', '2020-12-19 18:02:55', 1, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (62, '{\n valueField: \'IsTop\',\n textField: \'IsTop\',\n containField:null \n}', '2019-08-20 09:57:54', 1, '超级管理员', NULL, NULL, 'test1', 'top', 1, '超级管理员', '2022-01-03 19:13:37', 1, NULL, 1, 'dddd'); INSERT INTO `Sys_Dictionary` VALUES (64, NULL, '2019-09-18 19:25:47', 1, '超级管理员', NULL, NULL, '订单类型', 'ordertype', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO `Sys_Dictionary` VALUES (65, NULL, '2019-09-19 10:07:23', 1, '超级管理员', NULL, NULL, '商品名称', 'pn', 1, '超级管理员', '2022-07-12 10:55:23', 1, NULL, 0, NULL); @@ -913,7 +913,7 @@ CREATE TABLE `Sys_QuartzLog` ( `Id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `TaskName` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `ElapsedTime` int(11) NULL DEFAULT NULL, - `StratDate` datetime(0) NULL DEFAULT NULL, + `StartDate` datetime(0) NULL DEFAULT NULL, `EndDate` datetime(0) NULL DEFAULT NULL, `Result` int(11) NULL DEFAULT NULL, `ResponseContent` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, @@ -1294,7 +1294,7 @@ INSERT INTO `Sys_TableColumn` VALUES (429, 1, 0, NULL, NULL, '手机号', 'Phone INSERT INTO `Sys_TableColumn` VALUES (431, NULL, NULL, NULL, NULL, 'Token', 'Token', 'string', 180, '', NULL, NULL, NULL, '', NULL, 4, '', NULL, 1, 1, NULL, NULL, 1, 0, 500, '超级管理员', '2021-04-12 23:04:26', 1, 7810, '', NULL, 2, '', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (506, NULL, NULL, NULL, NULL, '性别', 'Gender', 'int', 100, '', NULL, NULL, NULL, 'gender', NULL, 4, 'drop', NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7843, '', NULL, 1, 'drop', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (654, NULL, NULL, NULL, NULL, '登陆设备类型', 'AppType', 'int', 150, '', NULL, NULL, NULL, 'ut', NULL, 0, '', NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7809, '', NULL, 3, 'dropList', 0, 'Sys_User', 6); -INSERT INTO `Sys_TableColumn` VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegregisterPhone', 'int', 120, '', NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7771, '', NULL, 3, 'drop', 0, 'Sys_User', 6); +INSERT INTO `Sys_TableColumn` VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegisterPhone', 'int', 120, '', NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2021-04-12 23:04:26', 1, 7771, '', NULL, 3, 'drop', 0, 'Sys_User', 6); INSERT INTO `Sys_TableColumn` VALUES (764, NULL, NULL, NULL, NULL, '', 'FormId', 'string', 110, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 0, NULL, 1, 0, 1, 36, '超级管理员', '2022-01-03 19:28:41', 1, 1150, NULL, NULL, NULL, NULL, 0, 'FormDesignOptions', 84); INSERT INTO `Sys_TableColumn` VALUES (765, NULL, NULL, NULL, NULL, '表单名称', 'Title', 'string', 220, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, 1, NULL, NULL, 1, 1, NULL, 0, 0, 0, 500, '超级管理员', '2022-01-03 19:28:41', 1, 1100, NULL, NULL, 1, 'like', 0, 'FormDesignOptions', 84); INSERT INTO `Sys_TableColumn` VALUES (766, NULL, NULL, NULL, NULL, '设计器配置', 'DaraggeOptions', 'string', 110, NULL, '2022-01-03 19:26:44', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 1, NULL, 0, 1, 0, 0, '超级管理员', '2022-01-03 19:28:41', 1, 1050, NULL, NULL, NULL, NULL, 0, 'FormDesignOptions', 84); @@ -1451,7 +1451,7 @@ CREATE TABLE `Sys_User` ( `Enable` tinyint(4) NOT NULL, `Gender` int(1) NULL DEFAULT NULL, `HeadImageUrl` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `IsRegregisterPhone` int(11) NOT NULL, + `IsRegisterPhone` int(11) NOT NULL, `LastLoginDate` datetime(0) NULL DEFAULT NULL, `LastModifyPwdDate` datetime(0) NULL DEFAULT NULL, `Mobile` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" index acf7cde1..cf4686f5 100644 --- "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" +++ "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/pgsql/pgsql(\345\220\253\345\237\272\347\241\200\346\225\260\346\215\256).sql" @@ -709,8 +709,8 @@ INSERT INTO "public"."Sys_Dictionary" VALUES (53, '{ containField:null }', NULL, 1, '测试超级管理员', NULL, NULL, '图片来源', 'ps', 1, NULL, NULL, NULL, NULL, 0, NULL); INSERT INTO "public"."Sys_Dictionary" VALUES (59, '{ - valueField: ''IsRegregisterPhone'', - textField: ''IsRegregisterPhone'', + valueField: ''IsRegisterPhone'', + textField: ''IsRegisterPhone'', containField:null }', NULL, 1, '测试超级管理员', NULL, NULL, '是否手机用户', 'isphone', 1, '超级管理员', NULL, 1, NULL, 0, NULL); INSERT INTO "public"."Sys_Dictionary" VALUES (60, '{ @@ -1432,7 +1432,7 @@ INSERT INTO "public"."Sys_TableColumn" VALUES (550, NULL, NULL, NULL, NULL, '申 INSERT INTO "public"."Sys_TableColumn" VALUES (551, NULL, NULL, NULL, NULL, '申请人帐号', 'UserName', 'string', 120, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, 30, '超级管理员', '2019-09-18 16:46:51', 1, 7920, NULL, NULL, NULL, NULL, NULL, 'App_Expert', 20); INSERT INTO "public"."Sys_TableColumn" VALUES (552, NULL, NULL, NULL, NULL, '申请人', 'UserTrueName', 'string', 120, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, 50, '超级管理员', '2019-09-18 16:46:51', 1, 7920, NULL, NULL, NULL, NULL, NULL, 'App_Expert', 20); INSERT INTO "public"."Sys_TableColumn" VALUES (654, NULL, NULL, NULL, NULL, '登陆设备类型', 'AppType', 'int', 150, NULL, NULL, NULL, NULL, 'ut', NULL, 0, NULL, NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7809, NULL, NULL, 3, 'dropList', NULL, 'Sys_User', 6); -INSERT INTO "public"."Sys_TableColumn" VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegregisterPhone', 'int', 120, NULL, NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7771, NULL, NULL, 3, 'drop', NULL, 'Sys_User', 6); +INSERT INTO "public"."Sys_TableColumn" VALUES (659, NULL, NULL, NULL, NULL, '是否手机用户', 'IsRegisterPhone', 'int', 120, NULL, NULL, NULL, NULL, 'isphone', NULL, 2, 'drop', NULL, 1, 0, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-12-08 22:22:13', 1, 7771, NULL, NULL, 3, 'drop', NULL, 'Sys_User', 6); INSERT INTO "public"."Sys_TableColumn" VALUES (663, NULL, NULL, NULL, NULL, '是否今日推荐', 'DailyRecommend', 'sbyte', 120, NULL, NULL, NULL, NULL, 'dr', NULL, 5, 'drop', NULL, 1, 1, NULL, NULL, 0, 0, NULL, '超级管理员', '2019-08-16 09:31:10', 1, 6825, NULL, NULL, 1, 'drop', NULL, 'App_News', 28); INSERT INTO "public"."Sys_TableColumn" VALUES (664, NULL, NULL, NULL, NULL, '推荐排序', 'OrderNo', 'int', 120, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL, NULL, 1, 1, NULL, NULL, 1, 0, NULL, '超级管理员', '2019-08-16 09:31:10', 1, 6822, NULL, NULL, NULL, '无', NULL, 'App_News', 28); INSERT INTO "public"."Sys_TableColumn" VALUES (714, NULL, NULL, NULL, NULL, 'Id', 'Order_Id', 'string', 90, NULL, '2019-08-22 17:26:55', 1, '超级管理员', NULL, NULL, NULL, NULL, NULL, 1, 0, NULL, 1, 0, 1, 36, '超级管理员', '2019-09-19 14:55:02', 1, 2850, NULL, NULL, NULL, NULL, NULL, 'SellOrder', 77); @@ -1619,7 +1619,7 @@ CREATE TABLE "public"."Sys_User" ( "Enable" int2 NOT NULL, "Gender" int4, "HeadImageUrl" varchar(200) COLLATE "pg_catalog"."default", - "IsRegregisterPhone" int4 NOT NULL, + "IsRegisterPhone" int4 NOT NULL, "LastLoginDate" timestamp(6), "LastModifyPwdDate" timestamp(6), "Mobile" varchar(100) COLLATE "pg_catalog"."default", diff --git "a/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/sqlserver/\350\241\250\347\273\223\346\236\204\344\270\216\346\225\260\346\215\256.sql" "b/\345\274\200\345\217\221\347\211\210dev/Vue.NetCore/DB/sqlserver/\350\241\250\347\273\223\346\236\204\344\270\216\346\225\260\346\215\256.sql" index 201db807bef7cc07d47bf5400d30d735e054b6ce..72d66cc18e01b65428235ad22004586facdfc4bc 100644 GIT binary patch delta 303 zcmaDhQE$>jy$u!l%!v#|lN%SCPuk70d0T#kQM1XSc9TVnK+Lq=WD&D~P0cLMu g1?kzwxLrk?dy_IN(ESW0)AiH2XKyd_=Ps}W0P|0BF#rGn delta 339 zcmbOZZn@#3D zOybxo_V#0|IJO^K#ra|xGtm0&8w0trXM$MMfh^JK30Jr{rYF4SlA7N2oJ(x_1S>9{ z>GL*oDNRdav75eN375q753jidm>7$;1D&~@aryxxCa&#!-g6nTLxlD+ZeR9;>kb>7 zXT`{^gy4yAaxY?r$n9o@t5Ff*{sR+b+k0Dd!lEdT%j -- Gitee From 2bbe20fba796e0e03a3237bd21df93c8e0743274 Mon Sep 17 00:00:00 2001 From: xwt Date: Thu, 20 Apr 2023 00:22:51 +0800 Subject: [PATCH 7/9] =?UTF-8?q?feat:=20uniapp=E6=8E=A5=E5=8F=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vol.uniapp/pages/login/login.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vol.uniapp/pages/login/login.vue b/vol.uniapp/pages/login/login.vue index 5ae768b3..ab270a7a 100644 --- a/vol.uniapp/pages/login/login.vue +++ b/vol.uniapp/pages/login/login.vue @@ -12,7 +12,7 @@