diff --git a/.codex/skills/ruoyi-plus-ai-coding/references/frontend.md b/.codex/skills/ruoyi-plus-ai-coding/references/frontend.md index a4340306d..2ba176945 100644 --- a/.codex/skills/ruoyi-plus-ai-coding/references/frontend.md +++ b/.codex/skills/ruoyi-plus-ai-coding/references/frontend.md @@ -2,7 +2,6 @@ ## 优先参考的代码来源 -- `ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/*.vm` - `ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/*.vm` - 前端工程中与目标模块最接近的现有页面 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java index c79f02cc8..9996b40e8 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java @@ -267,10 +267,9 @@ public interface GenConstants { String JAVA_CONTROLLER_TEMPLATE_PATH = "vm/java/controller.java.vm"; // MyBatis MapperXML 模板 String XML_MAPPER_TEMPLATE_PATH = "vm/xml/mapper.xml.vm"; - // 前端接口源码模板 - String TS_API_TEMPLATE_PATH = "vm/ts/api.ts.vm"; - String TS_TYPES_TEMPLATE_PATH = "vm/ts/types.ts.vm"; - // 前端页面源码模板 + // 前端源码模板 + String TS_API_TEMPLATE_PATH = "vm/vue/api.ts.vm"; + String TS_TYPES_TEMPLATE_PATH = "vm/vue/types.ts.vm"; String VUE_INDEX_TEMPLATE_PATH = "vm/vue/index.vue.vm"; String VUE_INDEX_TREE_TEMPLATE_PATH = "vm/vue/index-tree.vue.vm"; // 数据库SQL模板 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java index 2e60e2531..09196476a 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/TemplateEngineUtils.java @@ -24,8 +24,6 @@ import org.dromara.gen.util.template.PathNamedTemplate; import java.util.*; import java.util.function.Consumer; -import static org.dromara.gen.constant.GenConstants.TS_TYPES_TEMPLATE_PATH; - /** * 模板引擎工具 */ @@ -199,9 +197,9 @@ public class TemplateEngineUtils { templates.add(TEMPLATE_MAPPER.get(GenConstants.JAVA_CONTROLLER_TEMPLATE_PATH)); // MyBatis MapperXML 模板 templates.add(TEMPLATE_MAPPER.get(GenConstants.XML_MAPPER_TEMPLATE_PATH)); - // 前端接口源码模板 + // 前端 API 与类型模板 templates.add(TEMPLATE_MAPPER.get(GenConstants.TS_API_TEMPLATE_PATH)); - templates.add(TEMPLATE_MAPPER.get(TS_TYPES_TEMPLATE_PATH)); + templates.add(TEMPLATE_MAPPER.get(GenConstants.TS_TYPES_TEMPLATE_PATH)); // 数据库模板 DataBaseType dataBaseType = DataBaseHelper.getDataBaseType(dsName); if (dataBaseType.isOracle()) { @@ -214,7 +212,7 @@ public class TemplateEngineUtils { // 默认使用MySQL模板 templates.add(TEMPLATE_MAPPER.get(GenConstants.SQL_MYSQL_TEMPLATE_PATH)); } - // 前端页面源码模板 + // 前端页面模板 if (GenConstants.TPL_CRUD.equals(tplCategory)) { templates.add(TEMPLATE_MAPPER.get(GenConstants.VUE_INDEX_TEMPLATE_PATH)); } else if (GenConstants.TPL_TREE.equals(tplCategory)) { diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/api.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/api.ts.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/types.ts.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/types.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/types.ts.vm rename to ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/types.ts.vm