diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs index a7bfa3cf..c504bf61 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 35376b38..af2cc5ca 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/SqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt index a82aea13..f6e1aff3 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt @@ -1,12 +1,13 @@ -- 菜单 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('{functionName}', 0, 1, '{ModelTypeName}', '{ModuleName}/{ViewsFileName}/{ViewsFileName}', 0, 0, 'M', '0', '0', '', '{Permission}', '', GETDATE(), '', NULL, '{ModelTypeDesc}'); +VALUES ('{FunctionName}', 0, 1, '/{ModuleName}/{ModelTypeName}', '{ModuleName}/{ViewsFileName}/index', 0, 0, 'C', '0', '0', '', '{Permission}:list', '', GETDATE(), '', NULL, '{ModelTypeDesc}'); -- 按钮父菜单id declare @menuId int = @@identity + INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('查询', @menuId, 0, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:list}', '', '', GETDATE(), '', NULL, NULL); +VALUES ('查询', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:query', '', '', GETDATE(), '', NULL, ''); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) VALUES ('新增', @menuId, 1, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:add', '', '', GETDATE(), '', NULL, NULL); @@ -15,4 +16,4 @@ INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isC VALUES ('删除', @menuId, 2, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:delete', '', '', GETDATE(), '', NULL, NULL); INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by,create_time, update_by, update_time, remark) -VALUES ('修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', GETDATE(), '', NULL, NULL); \ No newline at end of file +VALUES ('修改', @menuId, 3, '#', NULL, 0, 0, 'F', '0', '0', '{Permission}:update', '', '', GETDATE(), '', NULL, NULL); diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueJsTemplate.txt index 36d1a405..d4efae36 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 1c793201..bca90fa2 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt @@ -19,14 +19,14 @@ 修改 - 删除 + 删除 - + {VueViewListContent}