From bb806063a0d477148b477daf306f1e3768f031de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Fri, 11 Mar 2022 20:51:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=E5=8D=95=E8=AF=8D=E6=8B=BC=E5=86=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt index 904e597..00858e0 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -95,7 +95,7 @@ $if(replaceDto.ShowBtnAdd) throw new CustomException("请求参数错误"); } //从 Dto 映射到 实体 - var model = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); + var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); var response = _${replaceDto.ModelTypeName}Service.Insert(model, it => new { @@ -124,7 +124,7 @@ $if(replaceDto.ShowBtnEdit) throw new CustomException("请求实体不能为空"); } //从 Dto 映射到 实体 - var model = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext); + var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext); var response = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == model.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}() { From 82aafaea8fcb37350485e4c230bc2fbeaca8185f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Fri, 11 Mar 2022 20:53:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=8C=BB=F0=9F=8C=BB=F0=9F=8C=BBupdate?= =?UTF-8?q?=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 38b8388..7febea1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## 🍟概述 * 本项目适合有一定NetCore和 vue基础的开发人员 -* 基于.NET 5实现的通用权限管理平台（RBAC模式）。整合最新技术高效快速开发，前后端分离模式，开箱即用。 +* 基于.NET5/.NET6实现的通用权限管理平台（RBAC模式）。整合最新技术高效快速开发，前后端分离模式，开箱即用。 * 代码量少、学习简单、通俗易懂、功能强大、易扩展、轻量级，让web开发更快速、简单高效（从此告别996），解决70%的重复工作，专注您的业务，轻松开发从现在开始！ * 前端采用Vue2.0、Element UI。 * 后端采用Net5、Sqlsugar、MySQL。 @@ -29,7 +29,7 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 element-ui，前端采用vscode工具开发 ## 🍀后端技术 -核心框架：.Net5.0 + Web API + sqlsugar + swagger + signalR +核心框架：.Net5.0/.Net6 + Web API + sqlsugar + swagger + signalR 定时计划任务：Quartz.Net组件 From ec1061f700f639db02711f7a6eb7db9d2505bbc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sat, 12 Mar 2022 21:51:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20=E5=8D=95=E8=AF=8D=E6=8B=BC=E5=86=99?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt index 00858e0..eb25c9d 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -97,7 +97,7 @@ $if(replaceDto.ShowBtnAdd) //从 Dto 映射到 实体 var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); - var response = _${replaceDto.ModelTypeName}Service.Insert(model, it => new + var response = _${replaceDto.ModelTypeName}Service.Insert(modal, it => new { $foreach(item in genTable.Columns) $if((item.IsInsert)) @@ -126,12 +126,12 @@ $if(replaceDto.ShowBtnEdit) //从 Dto 映射到 实体 var modal = parm.Adapt<${replaceDto.ModelTypeName}>().ToUpdate(HttpContext); - var response = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == model.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}() + var response = _${replaceDto.ModelTypeName}Service.Update(w => w.${replaceDto.PKName} == modal.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}() { //Update 字段映射 $foreach(item in genTable.Columns) $if((item.IsEdit)) - $item.CsharpField = model.$item.CsharpField, + $item.CsharpField = modal.$item.CsharpField, $end ${end} }); From a97c647b910b21188cd93ab4362aad2d578f2a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sun, 13 Mar 2022 19:17:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Vue/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZR.Vue/src/main.js b/ZR.Vue/src/main.js index 633ae62..6b2b1fd 100644 --- a/ZR.Vue/src/main.js +++ b/ZR.Vue/src/main.js @@ -16,7 +16,7 @@ import signalR from '@/utils/signalR' import './assets/icons' // icon import './permission' // permission control -import { getDicts} from "@/api/system/dict/data"; +import { getDicts } from "@/api/system/dict/data"; import { getConfigKey } from "@/api/system/config"; import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree, handleDict } from "@/utils/ruoyi"; //分页组件