From b4d570226a5a4ff96a8df4b07f9ac983ce07502b Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 14:45:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxkj/admin/config/AdminConfig.java | 5 +++-- .../java/com/hxkj/generator/util/VelocityUtil.java | 10 ++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java index 549eaa30..d36741fa 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java @@ -16,8 +16,9 @@ public class AdminConfig { // 免登录验证 public static String[] notLoginUri = new String[]{ - "system:login", // 登录接口 - "common:index:config" // 配置接口 + "system:login", // 登录接口 + "common:index:config", // 配置接口 + "gen:downloadCode", // 配置接口 }; // 免权限验证 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 9f28599a..fd6fb59c 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -119,13 +119,15 @@ public class VelocityUtil { templates.add("java/validate.java.vm"); templates.add("java/voList.java.vm"); templates.add("java/voDetail.java.vm"); - templates.add("vue/api.ts.vm"); - templates.add("vue/edit.vue.vm"); if (GenConstants.TPL_CRUD.equals(genTpl)) { + templates.add("vue/api.ts.vm"); + templates.add("vue/edit.vue.vm"); templates.add("vue/index.vue.vm"); } else if (GenConstants.TPL_TREE.equals(genTpl)) { + templates.add("vue/api.ts.vm"); + templates.add("vue/edit.vue.vm"); templates.add("vue/index-tree.vue.vm"); } @@ -164,10 +166,6 @@ public class VelocityUtil { fileName = StringUtil.format("{}/validate/{}/{}Param.java", GenConfig.adminPackage, moduleName, entityName); } - else if (template.contains("vo.java.vm")) { - fileName = StringUtil.format("{}/vo/{}/{}Vo.java", GenConfig.adminPackage, moduleName, entityName); - } - else if (template.contains("voList.java.vm")) { fileName = StringUtil.format("{}/vo/{}/{}ListVo.java", GenConfig.adminPackage, moduleName, entityName); }