From 35e7ce9c13db90f12e5f5ce33cc23ca988f7dec6 Mon Sep 17 00:00:00 2001 From: izory <599854767@qq.com> Date: Thu, 23 Sep 2021 22:26:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CodeGeneratorController.cs | 2 +- .../CodeGenTemplate/ControllersTemplate.txt | 2 +- .../wwwroot/CodeGenTemplate/VueJsTemplate.txt | 10 +- .../wwwroot/CodeGenTemplate/VueTemplate.txt | 4 +- ZR.CodeGenerator/CodeGenerateTemplate.cs | 2 +- ZR.CodeGenerator/CodeGeneratorTool.cs | 17 +- ZR.Vue/src/api/gendemo.js | 59 ---- ZR.Vue/src/views/gendemo/index.vue | 278 ------------------ ZRAdmin.xml | 41 --- 9 files changed, 18 insertions(+), 397 deletions(-) delete mode 100644 ZR.Vue/src/api/gendemo.js delete mode 100644 ZR.Vue/src/views/gendemo/index.vue diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs index a7bfa3c..c504bf6 100644 --- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs @@ -170,7 +170,7 @@ namespace ZR.Admin.WebApi.Controllers GenTable genTable = new() { BaseNameSpace = "ZR.",//导入默认命名空间前缀 - ModuleName = "bus",//导入默认模块名 + ModuleName = "business",//导入默认模块名 ClassName = CodeGeneratorTool.GetClassName(tableName), BusinessName = CodeGeneratorTool.GetClassName(tableName), FunctionAuthor = ConfigUtils.Instance.GetConfig(GenConstants.Gen_author), diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt index 35376b3..af2cc5c 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt @@ -21,7 +21,7 @@ namespace {ApiControllerNamespace}.Controllers /// 代码自动生成 /// [Verify] - [Route("bus/{ModelName}")] + [Route("{ModuleName}/{ModelName}")] public class {ModelName}Controller: BaseController { /// diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt index 36d1a40..d4efae3 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt @@ -6,7 +6,7 @@ */ export function list{ModelTypeName}(query) { return request({ - url: 'bus/{ModelTypeName}/list', + url: '{ModuleName}/{ModelTypeName}/list', method: 'get', params: query, }) @@ -18,7 +18,7 @@ export function list{ModelTypeName}(query) { */ export function add{ModelTypeName}(data) { return request({ - url: '/bus/{ModelTypeName}', + url: '{ModuleName}/{ModelTypeName}', method: 'post', data: data, }) @@ -30,7 +30,7 @@ export function add{ModelTypeName}(data) { */ export function update{ModelTypeName}(data) { return request({ - url: '/bus/{ModelTypeName}', + url: '{ModuleName}/{ModelTypeName}', method: 'PUT', data: data, }) @@ -42,7 +42,7 @@ export function update{ModelTypeName}(data) { */ export function get{ModelTypeName}(id) { return request({ - url: '/bus/{ModelTypeName}/' + id, + url: '{ModuleName}/{ModelTypeName}/' + id, method: 'get' }) } @@ -53,7 +53,7 @@ export function get{ModelTypeName}(id) { */ export function del{ModelTypeName}(pid) { return request({ - url: '/bus/{ModelTypeName}/' + pid, + url: '{ModuleName}/{ModelTypeName}/' + pid, method: 'delete' }) } diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt index 1c79320..bca90fa 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt @@ -19,14 +19,14 @@ 修改 - 删除 + 删除 - + {VueViewListContent}