From d6cded95ad38f7c56d000df4163b386e44594ebc Mon Sep 17 00:00:00 2001 From: QcQ Date: Wed, 27 Nov 2019 13:29:55 +0800 Subject: [PATCH] =?UTF-8?q?fix=20gen=20bugs,=20=E9=BB=98=E8=AE=A4=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=A1=A8=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/generator/util/VelocityUtils.java | 1 + .../src/main/resources/generator.yml | 6 +++--- .../src/main/resources/vm/sql/sql.vm | 21 +++++++++---------- .../src/main/resources/vm/vue/list.vue.vm | 6 +++--- .../src/main/resources/vm/vue/modal.vue.vm | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index fe0ed7b..f00bb53 100644 --- a/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-service/ruoyi-gen/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -51,6 +51,7 @@ public class VelocityUtils velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); velocityContext.put("columns", genTable.getColumns()); velocityContext.put("table", genTable); + velocityContext.put("nowDate", DateUtils.getTime()); if (GenConstants.TPL_TREE.equals(tplCategory)) { setTreeVelocityContext(velocityContext, genTable); diff --git a/ruoyi-service/ruoyi-gen/src/main/resources/generator.yml b/ruoyi-service/ruoyi-gen/src/main/resources/generator.yml index fedd7cf..8884260 100644 --- a/ruoyi-service/ruoyi-gen/src/main/resources/generator.yml +++ b/ruoyi-service/ruoyi-gen/src/main/resources/generator.yml @@ -5,7 +5,7 @@ gen: author: ruoyi # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool packageName: com.ruoyi.system - # 自动去除表前缀，默认是false - autoRemovePre: false - # 表前缀(类名不会包含表前缀) + # 自动去除表前缀，默认是true + autoRemovePre: true + # 表前缀(类名不会包含表前缀)开发时改为自己的表前缀 tablePrefix: sys_ \ No newline at end of file diff --git a/ruoyi-service/ruoyi-gen/src/main/resources/vm/sql/sql.vm b/ruoyi-service/ruoyi-gen/src/main/resources/vm/sql/sql.vm index 4b85bdb..ea0b5ca 100644 --- a/ruoyi-service/ruoyi-gen/src/main/resources/vm/sql/sql.vm +++ b/ruoyi-service/ruoyi-gen/src/main/resources/vm/sql/sql.vm @@ -1,19 +1,18 @@ --- 菜单 SQL -insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '3', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '${functionName}菜单'); +insert into sys_menu (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}管理', '${businessName}', '/${moduleName}/${ClassName}List','1', '', '1', 'C', '0', '${permissionPrefix}:view', '#', 'admin', '${nowDate}', 'ry', '${nowDate}', '${functionName}菜单'); -- 按钮父菜单ID SELECT @parentId := LAST_INSERT_ID(); -- 按钮 SQL -insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', 'F', '0', '${permissionPrefix}:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); +insert into sys_menu (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}查询', '', NULL, @parentId, '', '1', 'F', '0', '${permissionPrefix}:list', '#', 'admin', '${nowDate}', 'ry', '${nowDate}', ''); -insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', 'F', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); +insert into sys_menu (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}新增', '', NULL, @parentId, '', '2', 'F', '0', '${permissionPrefix}:add', '#', 'admin', '${nowDate}', 'ry', '${nowDate}', ''); -insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', 'F', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); +insert into sys_menu (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}修改', '', NULL, @parentId, '', '3', 'F', '0', '${permissionPrefix}:edit', '#', 'admin', '${nowDate}', 'ry', '${nowDate}', ''); -insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', 'F', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); +insert into sys_menu (menu_name, menu_key, component, parent_id, target, order_num, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}删除', '', NULL, @parentId, '', '4', 'F', '0', '${permissionPrefix}:remove', '#', 'admin', '${nowDate}', 'ry', '${nowDate}', ''); diff --git a/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/list.vue.vm b/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/list.vue.vm index 81837bf..0a3cd1c 100644 --- a/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/list.vue.vm +++ b/ruoyi-service/ruoyi-gen/src/main/resources/vm/vue/list.vue.vm @@ -58,7 +58,7 @@