From e0bdc4f4c1c5f25aa4930909f96c6a9e669e83a1 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Wed, 6 Dec 2023 00:30:18 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E7=B3=BB=E7=BB=9F=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E6=A0=B7=E7=94=9F=E6=88=90=E7=9A=84=E6=96=87=E4=BB=B6=E4=B9=9F?= =?UTF-8?q?=E6=9C=89=E5=B7=AE=E5=BC=82=EF=BC=8C=E9=82=A3=E5=B0=B1=E5=90=84?= =?UTF-8?q?=E8=87=AA=E7=94=9F=E6=88=90=E5=90=84=E8=87=AA=E3=80=82=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=E6=B5=8B=E8=AF=95=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B5=84=E6=BA=90=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inner/CodegenEngineAbstractTest.java | 17 ++++++++++----- .../codegen/inner/CodegenEngineVue2Test.java | 20 ++++++++++-------- .../codegen/inner/CodegenEngineVue3Test.java | 21 +++++++++++-------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java index 588f2b08b..f8b778e30 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java @@ -31,6 +31,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { + public String resourcesPath = ""; // 测试文件资源目录 + public static final String OS_NAME = System.getProperty("os.name").toLowerCase().replace(" ", ""); // 操作系统名称 + @InjectMocks protected CodegenEngine codegenEngine; @@ -41,6 +44,10 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { @BeforeEach public void setUp() { codegenEngine.initGlobalBindingMap(); + // 获取测试文件 resources 路径 + String absolutePath = FileUtil.getAbsolutePath("application-unit-test.yaml"); + // 系统不一样生成的文件也有差异，那就各自生成各自的 + resourcesPath = absolutePath.split("/target")[0] + "/src/test/resources/codegen/" + OS_NAME; } protected static CodegenTableDO getTable(String name) { @@ -73,14 +80,14 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { @SuppressWarnings("rawtypes") protected static void assertResult(Map result, String path) { - String assertContent = ResourceUtil.readUtf8Str(path + "/assert.json"); + String assertContent = ResourceUtil.readUtf8Str("codegen/" + OS_NAME + path + "/assert.json"); List asserts = JsonUtils.parseArray(assertContent, HashMap.class); assertEquals(asserts.size(), result.size()); // 校验每个文件 asserts.forEach(assertMap -> { String contentPath = (String) assertMap.get("contentPath"); String filePath = (String) assertMap.get("filePath"); - String content = ResourceUtil.readUtf8Str(path + "/" + contentPath); + String content = ResourceUtil.readUtf8Str("codegen/" + OS_NAME + path + "/" + contentPath); assertEquals(content, result.get(filePath), filePath + "：不匹配"); }); } @@ -91,7 +98,7 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { * 【调试使用】将生成的代码，写入到文件 * * @param result 生成的代码 - * @param path 写入文件的路径 + * @param path 写入文件的路径 */ protected void writeFile(Map result, String path) { // 生成压缩包 @@ -106,7 +113,7 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { /** * 【调试使用】将生成的结果，写入到文件 * - * @param result 生成的代码 + * @param result 生成的代码 * @param basePath 写入文件的路径（绝对路径） */ protected void writeResult(Map result, String basePath) { @@ -121,7 +128,7 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { FileUtil.writeUtf8String(fileContent, basePath + "/" + contentPath); }); // 写入 assert.json 文件 - FileUtil.writeUtf8String(JsonUtils.toJsonPrettyString(asserts), basePath +"/assert.json"); + FileUtil.writeUtf8String(JsonUtils.toJsonPrettyString(asserts), basePath + "/assert.json"); } } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java index a8be74120..94d24bed1 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java @@ -11,7 +11,6 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -// TODO @puhui999：单测需要 fix /** * {@link CodegenEngine} 的 Vue2 + Element UI 单元测试 * @@ -30,9 +29,10 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest { // 调用 Map result = codegenEngine.execute(table, columns, null, null); + // 生成测试文件 + //writeResult(result, resourcesPath + "/vue2_one"); // 断言 - assertResult(result, "codegen/vue2_one"); -// writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one"); + assertResult(result, "/vue2_one"); } @Test @@ -45,25 +45,26 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest { // 调用 Map result = codegenEngine.execute(table, columns, null, null); + // 生成测试文件 + //writeResult(result, resourcesPath + "/vue2_tree"); // 断言 - assertResult(result, "codegen/vue2_tree"); -// writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree"); + assertResult(result, "/vue2_tree"); // writeFile(result, "/Users/yunai/test/demo66.zip"); } @Test public void testExecute_vue2_master_normal() { - testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "codegen/vue2_master_normal"); + testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "/vue2_master_normal"); } @Test public void testExecute_vue2_master_erp() { - testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_ERP, "codegen/vue2_master_erp"); + testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_ERP, "/vue2_master_erp"); } @Test public void testExecute_vue2_master_inner() { - testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_INNER, "codegen/vue2_master_inner"); + testExecute_vue2_master(CodegenTemplateTypeEnum.MASTER_INNER, "/vue2_master_inner"); } private void testExecute_vue2_master(CodegenTemplateTypeEnum templateType, @@ -89,9 +90,10 @@ public class CodegenEngineVue2Test extends CodegenEngineAbstractTest { // 调用 Map result = codegenEngine.execute(table, columns, Arrays.asList(contactTable, teacherTable), Arrays.asList(contactColumns, teacherColumns)); + // 生成测试文件 + //writeResult(result, resourcesPath + path); // 断言 assertResult(result, path); -// writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/" + path); // writeFile(result, "/Users/yunai/test/demo11.zip"); } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java index 56ad78aec..ce745c910 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java @@ -27,9 +27,10 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest { // 调用 Map result = codegenEngine.execute(table, columns, null, null); + // 生成测试文件 + //writeResult(result, resourcesPath + "/vue3_one"); // 断言 - assertResult(result, "codegen/vue3_one"); -// writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one"); + assertResult(result, "/vue3_one"); } @Test @@ -42,25 +43,26 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest { // 调用 Map result = codegenEngine.execute(table, columns, null, null); + // 生成测试文件 + //writeResult(result, resourcesPath + "/vue3_tree"); // 断言 - assertResult(result, "codegen/vue3_tree"); -// writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree"); + assertResult(result, "/vue3_tree"); // writeFile(result, "/Users/yunai/test/demo66.zip"); } @Test public void testExecute_vue3_master_normal() { - testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "codegen/vue3_master_normal"); + testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_NORMAL, "/vue3_master_normal"); } @Test public void testExecute_vue3_master_erp() { - testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_ERP, "codegen/vue3_master_erp"); + testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_ERP, "/vue3_master_erp"); } @Test public void testExecute_vue3_master_inner() { - testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_INNER, "codegen/vue3_master_inner"); + testExecute_vue3_master(CodegenTemplateTypeEnum.MASTER_INNER, "/vue3_master_inner"); } private void testExecute_vue3_master(CodegenTemplateTypeEnum templateType, @@ -86,10 +88,11 @@ public class CodegenEngineVue3Test extends CodegenEngineAbstractTest { // 调用 Map result = codegenEngine.execute(table, columns, Arrays.asList(contactTable, teacherTable), Arrays.asList(contactColumns, teacherColumns)); + // 生成测试文件 + //writeResult(result, resourcesPath + path); // 断言 assertResult(result, path); -// writeResult(result, "/root/ruoyi-vue-pro/yudao-module-infra/yudao-module-infra-biz/src/test/resources/" + path); -// writeFile(result, "/Users/yunai/test/demo11.zip"); + // writeFile(result, "/Users/yunai/test/demo11.zip"); } } From a9b265697135014b1c9399ddb835f4f86b610c30 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Wed, 6 Dec 2023 00:30:52 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E7=94=9F=E6=88=90=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vue2_master_erp/assert.json | 4 +- .../java/ErrorCodeConstants_手动操作 | 0 .../java/InfraStudentContactDO | 0 .../java/InfraStudentContactMapper | 0 .../java/InfraStudentController | 0 .../vue2_master_erp/java/InfraStudentDO | 0 .../vue2_master_erp/java/InfraStudentMapper | 0 .../java/InfraStudentPageReqVO | 0 .../vue2_master_erp/java/InfraStudentRespVO | 0 .../java/InfraStudentSaveReqVO | 0 .../vue2_master_erp/java/InfraStudentService | 0 .../java/InfraStudentServiceImpl | 0 .../java/InfraStudentServiceImplTest | 0 .../java/InfraStudentTeacherDO | 0 .../java/InfraStudentTeacherMapper | 0 .../vue2_master_erp/js/index} | 0 .../{ => windows10}/vue2_master_erp/sql/h2 | 0 .../{ => windows10}/vue2_master_erp/sql/sql | 0 .../vue2_master_erp/vue/StudentContactForm | 0 .../vue2_master_erp/vue/StudentContactList | 0 .../vue2_master_erp/vue/StudentForm | 0 .../vue2_master_erp/vue/StudentTeacherForm | 0 .../vue2_master_erp/vue/StudentTeacherList | 0 .../{ => windows10}/vue2_master_erp/vue/index | 0 .../vue2_master_erp/xml/InfraStudentMapper | 0 .../vue2_master_inner/assert.json | 4 +- .../java/ErrorCodeConstants_手动操作 | 0 .../java/InfraStudentContactDO | 0 .../java/InfraStudentContactMapper | 0 .../java/InfraStudentController | 0 .../vue2_master_inner/java/InfraStudentDO | 0 .../vue2_master_inner/java/InfraStudentMapper | 0 .../java/InfraStudentPageReqVO | 0 .../vue2_master_inner/java/InfraStudentRespVO | 0 .../java/InfraStudentSaveReqVO | 0 .../java/InfraStudentService | 0 .../java/InfraStudentServiceImpl | 0 .../java/InfraStudentServiceImplTest | 0 .../java/InfraStudentTeacherDO | 0 .../java/InfraStudentTeacherMapper | 0 .../vue2_master_inner/js/index} | 0 .../{ => windows10}/vue2_master_inner/sql/h2 | 0 .../{ => windows10}/vue2_master_inner/sql/sql | 0 .../vue2_master_inner/vue/StudentContactForm | 0 .../vue2_master_inner/vue/StudentContactList | 0 .../vue2_master_inner/vue/StudentForm | 0 .../vue2_master_inner/vue/StudentTeacherForm | 0 .../vue2_master_inner/vue/StudentTeacherList | 0 .../vue2_master_inner/vue/index | 0 .../vue2_master_inner/xml/InfraStudentMapper | 0 .../vue2_master_normal/assert.json | 4 +- .../java/ErrorCodeConstants_手动操作 | 0 .../java/InfraStudentContactDO | 0 .../java/InfraStudentContactMapper | 0 .../java/InfraStudentController | 0 .../vue2_master_normal/java/InfraStudentDO | 0 .../java/InfraStudentMapper | 0 .../java/InfraStudentPageReqVO | 0 .../java/InfraStudentRespVO | 0 .../java/InfraStudentSaveReqVO | 0 .../java/InfraStudentService | 0 .../java/InfraStudentServiceImpl | 0 .../java/InfraStudentServiceImplTest | 0 .../java/InfraStudentTeacherDO | 0 .../java/InfraStudentTeacherMapper | 0 .../vue2_master_normal/js/index} | 0 .../{ => windows10}/vue2_master_normal/sql/h2 | 0 .../vue2_master_normal/sql/sql | 0 .../vue2_master_normal/vue/StudentContactForm | 0 .../vue2_master_normal/vue/StudentForm | 0 .../vue2_master_normal/vue/StudentTeacherForm | 0 .../vue2_master_normal/vue/index | 0 .../vue2_master_normal/xml/InfraStudentMapper | 0 .../{ => windows10}/vue2_one/assert.json | 4 +- .../vue2_one/java/ErrorCodeConstants_手动操作 | 0 .../vue2_one/java/InfraStudentController | 0 .../vue2_one/java/InfraStudentDO | 0 .../vue2_one/java/InfraStudentMapper | 0 .../vue2_one/java/InfraStudentPageReqVO | 0 .../vue2_one/java/InfraStudentRespVO | 0 .../vue2_one/java/InfraStudentSaveReqVO | 0 .../vue2_one/java/InfraStudentService | 0 .../vue2_one/java/InfraStudentServiceImpl | 0 .../vue2_one/java/InfraStudentServiceImplTest | 0 .../student => windows10/vue2_one/js/index} | 0 .../codegen/{ => windows10}/vue2_one/sql/h2 | 0 .../codegen/{ => windows10}/vue2_one/sql/sql | 0 .../{ => windows10}/vue2_one/vue/StudentForm | 0 .../{ => windows10}/vue2_one/vue/index | 0 .../vue2_one/xml/InfraStudentMapper | 0 .../{ => windows10}/vue2_tree/assert.json | 4 +- .../java/ErrorCodeConstants_手动操作 | 0 .../vue2_tree/java/InfraCategoryController | 0 .../vue2_tree/java/InfraCategoryDO | 0 .../vue2_tree/java/InfraCategoryListReqVO | 0 .../vue2_tree/java/InfraCategoryMapper | 0 .../vue2_tree/java/InfraCategoryRespVO | 0 .../vue2_tree/java/InfraCategorySaveReqVO | 0 .../vue2_tree/java/InfraCategoryService | 0 .../vue2_tree/java/InfraCategoryServiceImpl | 0 .../java/InfraCategoryServiceImplTest | 0 .../category => windows10/vue2_tree/js/index} | 0 .../codegen/{ => windows10}/vue2_tree/sql/h2 | 0 .../codegen/{ => windows10}/vue2_tree/sql/sql | 0 .../vue2_tree/vue/CategoryForm | 0 .../{ => windows10}/vue2_tree/vue/index | 0 .../vue2_tree/xml/InfraCategoryMapper | 0 .../vue3_master_erp/assert.json | 0 .../java/ErrorCodeConstants_手动操作 | 12 +- .../java/InfraStudentContactDO | 0 .../java/InfraStudentContactMapper | 0 .../java/InfraStudentController | 0 .../vue3_master_erp/java/InfraStudentDO | 0 .../vue3_master_erp/java/InfraStudentMapper | 0 .../java/InfraStudentPageReqVO | 0 .../vue3_master_erp/java/InfraStudentRespVO | 0 .../java/InfraStudentSaveReqVO | 0 .../vue3_master_erp/java/InfraStudentService | 0 .../java/InfraStudentServiceImpl | 0 .../java/InfraStudentServiceImplTest | 0 .../java/InfraStudentTeacherDO | 0 .../java/InfraStudentTeacherMapper | 0 .../{ => windows10}/vue3_master_erp/sql/h2 | 0 .../{ => windows10}/vue3_master_erp/sql/sql | 110 +++++----- .../{ => windows10}/vue3_master_erp/ts/index | 190 +++++++++--------- .../vue3_master_erp/vue/StudentContactForm | 6 +- .../vue3_master_erp/vue/StudentContactList | 0 .../vue3_master_erp}/vue/StudentForm | 6 +- .../vue3_master_erp/vue/StudentTeacherForm | 6 +- .../vue3_master_erp/vue/StudentTeacherList | 0 .../{ => windows10}/vue3_master_erp/vue/index | 2 +- .../vue3_master_erp/xml/InfraStudentMapper | 0 .../vue3_master_inner/assert.json | 0 .../java/ErrorCodeConstants_手动操作 | 6 +- .../java/InfraStudentContactDO | 0 .../java/InfraStudentContactMapper | 0 .../java/InfraStudentController | 0 .../vue3_master_inner/java/InfraStudentDO | 0 .../vue3_master_inner/java/InfraStudentMapper | 0 .../java/InfraStudentPageReqVO | 0 .../vue3_master_inner/java/InfraStudentRespVO | 0 .../java/InfraStudentSaveReqVO | 0 .../java/InfraStudentService | 0 .../java/InfraStudentServiceImpl | 0 .../java/InfraStudentServiceImplTest | 0 .../java/InfraStudentTeacherDO | 0 .../java/InfraStudentTeacherMapper | 0 .../{ => windows10}/vue3_master_inner/sql/h2 | 0 .../vue3_master_inner}/sql/sql | 110 +++++----- .../vue3_master_inner}/ts/index | 114 +++++------ .../vue3_master_inner}/vue/StudentContactForm | 4 +- .../vue3_master_inner/vue/StudentContactList | 0 .../vue3_master_inner}/vue/StudentForm | 6 +- .../vue3_master_inner/vue/StudentTeacherForm | 2 +- .../vue3_master_inner/vue/StudentTeacherList | 0 .../vue3_master_inner/vue/index | 2 +- .../vue3_master_inner/xml/InfraStudentMapper | 0 .../vue3_master_normal/assert.json | 0 .../java/ErrorCodeConstants_手动操作 | 6 +- .../java/InfraStudentContactDO | 0 .../java/InfraStudentContactMapper | 0 .../java/InfraStudentController | 0 .../vue3_master_normal/java/InfraStudentDO | 0 .../java/InfraStudentMapper | 0 .../java/InfraStudentPageReqVO | 0 .../java/InfraStudentRespVO | 0 .../java/InfraStudentSaveReqVO | 0 .../java/InfraStudentService | 0 .../java/InfraStudentServiceImpl | 0 .../java/InfraStudentServiceImplTest | 0 .../java/InfraStudentTeacherDO | 0 .../java/InfraStudentTeacherMapper | 0 .../{ => windows10}/vue3_master_normal/sql/h2 | 0 .../vue3_master_normal}/sql/sql | 110 +++++----- .../vue3_master_normal}/ts/index | 114 +++++------ .../vue/StudentContactForm | 4 +- .../vue3_master_normal}/vue/StudentForm | 6 +- .../vue3_master_normal/vue/StudentTeacherForm | 2 +- .../vue3_master_normal/vue/index | 2 +- .../vue3_master_normal/xml/InfraStudentMapper | 0 .../{ => windows10}/vue3_one/assert.json | 0 .../vue3_one/java/ErrorCodeConstants_手动操作 | 6 +- .../vue3_one/java/InfraStudentController | 0 .../vue3_one/java/InfraStudentDO | 0 .../vue3_one/java/InfraStudentMapper | 0 .../vue3_one/java/InfraStudentPageReqVO | 0 .../vue3_one/java/InfraStudentRespVO | 0 .../vue3_one/java/InfraStudentSaveReqVO | 0 .../vue3_one/java/InfraStudentService | 0 .../vue3_one/java/InfraStudentServiceImpl | 0 .../vue3_one/java/InfraStudentServiceImplTest | 0 .../codegen/{ => windows10}/vue3_one/sql/h2 | 0 .../codegen/{ => windows10}/vue3_one/sql/sql | 110 +++++----- .../codegen/{ => windows10}/vue3_one/ts/index | 86 ++++---- .../vue3_one}/vue/StudentForm | 6 +- .../{ => windows10}/vue3_one/vue/index | 2 +- .../vue3_one/xml/InfraStudentMapper | 0 .../{ => windows10}/vue3_tree/assert.json | 0 .../java/ErrorCodeConstants_手动操作 | 16 +- .../vue3_tree/java/InfraCategoryController | 0 .../vue3_tree/java/InfraCategoryDO | 0 .../vue3_tree/java/InfraCategoryListReqVO | 0 .../vue3_tree/java/InfraCategoryMapper | 0 .../vue3_tree/java/InfraCategoryRespVO | 0 .../vue3_tree/java/InfraCategorySaveReqVO | 0 .../vue3_tree/java/InfraCategoryService | 0 .../vue3_tree/java/InfraCategoryServiceImpl | 0 .../java/InfraCategoryServiceImplTest | 0 .../codegen/{ => windows10}/vue3_tree/sql/h2 | 0 .../codegen/{ => windows10}/vue3_tree/sql/sql | 110 +++++----- .../{ => windows10}/vue3_tree/ts/index | 74 +++---- .../vue3_tree/vue/CategoryForm | 6 +- .../{ => windows10}/vue3_tree/vue/index | 2 +- .../vue3_tree/xml/InfraCategoryMapper | 0 214 files changed, 629 insertions(+), 629 deletions(-) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/assert.json (97%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/ErrorCodeConstants_手动操作 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentContactDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentContactMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentPageReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentSaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentTeacherDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/java/InfraStudentTeacherMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue2_master_erp/js/student => windows10/vue2_master_erp/js/index} (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/sql/sql (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/vue/StudentContactForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/vue/StudentContactList (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/vue/StudentForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/vue/StudentTeacherForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/vue/StudentTeacherList (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/vue/index (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_erp/xml/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/assert.json (97%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/ErrorCodeConstants_手动操作 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentContactDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentContactMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentPageReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentSaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentTeacherDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/java/InfraStudentTeacherMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue2_master_inner/js/student => windows10/vue2_master_inner/js/index} (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/sql/sql (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/vue/StudentContactForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/vue/StudentContactList (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/vue/StudentForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/vue/StudentTeacherForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/vue/StudentTeacherList (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/vue/index (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_inner/xml/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/assert.json (97%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/ErrorCodeConstants_手动操作 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentContactDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentContactMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentPageReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentSaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentTeacherDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/java/InfraStudentTeacherMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue2_master_normal/js/student => windows10/vue2_master_normal/js/index} (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/sql/sql (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/vue/StudentContactForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/vue/StudentForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/vue/StudentTeacherForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/vue/index (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_master_normal/xml/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/assert.json (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/ErrorCodeConstants_手动操作 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentPageReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentSaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/java/InfraStudentServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue2_one/js/student => windows10/vue2_one/js/index} (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/sql/sql (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/vue/StudentForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/vue/index (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_one/xml/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/assert.json (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/ErrorCodeConstants_手动操作 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategoryController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategoryDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategoryListReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategoryMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategoryRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategorySaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategoryService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategoryServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/java/InfraCategoryServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue2_tree/js/category => windows10/vue2_tree/js/index} (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/sql/sql (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/vue/CategoryForm (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/vue/index (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue2_tree/xml/InfraCategoryMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/assert.json (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/ErrorCodeConstants_手动操作 (93%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentContactDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentContactMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentPageReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentSaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentTeacherDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/java/InfraStudentTeacherMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/sql/sql (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/ts/index (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/vue/StudentContactForm (98%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/vue/StudentContactList (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_one => windows10/vue3_master_erp}/vue/StudentForm (98%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/vue/StudentTeacherForm (98%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/vue/StudentTeacherList (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/vue/index (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_erp/xml/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/assert.json (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/ErrorCodeConstants_手动操作 (93%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentContactDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentContactMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentPageReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentSaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentTeacherDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/java/InfraStudentTeacherMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_normal => windows10/vue3_master_inner}/sql/sql (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_normal => windows10/vue3_master_inner}/ts/index (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_normal => windows10/vue3_master_inner}/vue/StudentContactForm (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/vue/StudentContactList (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_normal => windows10/vue3_master_inner}/vue/StudentForm (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/vue/StudentTeacherForm (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/vue/StudentTeacherList (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/vue/index (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_inner/xml/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/assert.json (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/ErrorCodeConstants_手动操作 (93%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentContactDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentContactMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentPageReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentSaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentTeacherDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/java/InfraStudentTeacherMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_inner => windows10/vue3_master_normal}/sql/sql (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_inner => windows10/vue3_master_normal}/ts/index (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_inner => windows10/vue3_master_normal}/vue/StudentContactForm (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_inner => windows10/vue3_master_normal}/vue/StudentForm (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/vue/StudentTeacherForm (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/vue/index (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_master_normal/xml/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/assert.json (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/ErrorCodeConstants_手动操作 (93%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentPageReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentSaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/java/InfraStudentServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/sql/sql (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/ts/index (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{vue3_master_erp => windows10/vue3_one}/vue/StudentForm (98%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/vue/index (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_one/xml/InfraStudentMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/assert.json (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/ErrorCodeConstants_手动操作 (98%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategoryController (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategoryDO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategoryListReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategoryMapper (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategoryRespVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategorySaveReqVO (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategoryService (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategoryServiceImpl (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/java/InfraCategoryServiceImplTest (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/sql/h2 (100%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/sql/sql (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/ts/index (96%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/vue/CategoryForm (97%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/vue/index (99%) rename yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/{ => windows10}/vue3_tree/xml/InfraCategoryMapper (100%) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json similarity index 97% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json index f95ae9af1..8edb8e612 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/assert.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/assert.json @@ -53,8 +53,8 @@ "contentPath" : "vue/index", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue" }, { - "contentPath" : "js/student", - "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js" + "contentPath": "js/index", + "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js" }, { "contentPath" : "vue/StudentForm", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue" diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/ErrorCodeConstants_手动操作 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/ErrorCodeConstants_手动操作 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentContactMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentContactMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentPageReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentPageReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentSaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/java/InfraStudentTeacherMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/java/InfraStudentTeacherMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/js/student b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/js/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/js/student rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/js/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/sql similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/sql/sql diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactList similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentContactList rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentContactList diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherList similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/StudentTeacherList rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/StudentTeacherList diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/vue/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_erp/xml/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_erp/xml/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/assert.json similarity index 97% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/assert.json index f95ae9af1..8edb8e612 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/assert.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/assert.json @@ -53,8 +53,8 @@ "contentPath" : "vue/index", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue" }, { - "contentPath" : "js/student", - "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js" + "contentPath": "js/index", + "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js" }, { "contentPath" : "vue/StudentForm", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue" diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/ErrorCodeConstants_手动操作 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/ErrorCodeConstants_手动操作 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentContactMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentContactMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentPageReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentPageReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentPageReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentSaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentSaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/java/InfraStudentTeacherMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/java/InfraStudentTeacherMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/js/student b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/js/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/js/student rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/js/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/sql/sql similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/sql/sql diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactList similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentContactList rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentContactList diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherList similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/StudentTeacherList rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/StudentTeacherList diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/vue/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/xml/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_inner/xml/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_inner/xml/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/assert.json similarity index 97% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/assert.json index 844cc753c..6f94535e0 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/assert.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/assert.json @@ -53,8 +53,8 @@ "contentPath" : "vue/index", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue" }, { - "contentPath" : "js/student", - "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js" + "contentPath": "js/index", + "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js" }, { "contentPath" : "vue/StudentForm", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue" diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/ErrorCodeConstants_手动操作 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/ErrorCodeConstants_手动操作 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentContactMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentContactMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentPageReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentPageReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentPageReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentSaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentSaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/java/InfraStudentTeacherMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/java/InfraStudentTeacherMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/js/student b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/js/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/js/student rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/js/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/sql/sql similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/sql/sql diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentContactForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentContactForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentContactForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentTeacherForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/StudentTeacherForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/StudentTeacherForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/vue/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/xml/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_master_normal/xml/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_master_normal/xml/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/assert.json similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/assert.json index ccb00a814..5a37c376a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/assert.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/assert.json @@ -41,8 +41,8 @@ "contentPath" : "vue/index", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue" }, { - "contentPath" : "js/student", - "filePath" : "yudao-ui-admin-vue2/src/api/infra/student.js" + "contentPath": "js/index", + "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js" }, { "contentPath" : "vue/StudentForm", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/StudentForm.vue" diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/ErrorCodeConstants_手动操作 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/ErrorCodeConstants_手动操作 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentPageReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentPageReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentPageReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentSaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentSaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/java/InfraStudentServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/js/student b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/js/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/js/student rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/js/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/sql similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/sql/sql diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/StudentForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/StudentForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/StudentForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/vue/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/xml/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_one/xml/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_one/xml/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/assert.json similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/assert.json index 470a9dec8..a7d2f569c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/assert.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/assert.json @@ -41,8 +41,8 @@ "contentPath" : "vue/index", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/index.vue" }, { - "contentPath" : "js/category", - "filePath" : "yudao-ui-admin-vue2/src/api/infra/category.js" + "contentPath": "js/index", + "filePath": "yudao-ui-admin-vue2/src/api/infra/demo/index.js" }, { "contentPath" : "vue/CategoryForm", "filePath" : "yudao-ui-admin-vue2/src/views/infra/demo/CategoryForm.vue" diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/ErrorCodeConstants_手动操作 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/ErrorCodeConstants_手动操作 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryListReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryListReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryListReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryListReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategorySaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategorySaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/java/InfraCategoryServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/js/category b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/js/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/js/category rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/js/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/sql similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/sql/sql diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/vue/CategoryForm similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/CategoryForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/vue/CategoryForm diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/vue/index similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/vue/index diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/xml/InfraCategoryMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/xml/InfraCategoryMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue2_tree/xml/InfraCategoryMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue2_tree/xml/InfraCategoryMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/assert.json similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/assert.json diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/ErrorCodeConstants_手动操作 similarity index 93% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/ErrorCodeConstants_手动操作 index 5e64b117f..d3201dec3 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/ErrorCodeConstants_手动操作 +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/ErrorCodeConstants_手动操作 @@ -1,6 +1,6 @@ -// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ -// ========== 学生 TODO 补充编号 ========== -ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在"); -ErrorCode STUDENT_CONTACT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生联系人不存在"); -ErrorCode STUDENT_TEACHER_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生班主任不存在"); -ErrorCode STUDENT_TEACHER_EXISTS = new ErrorCode(TODO 补充编号, "学生班主任已存在"); \ No newline at end of file +// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ +// ========== 学生 TODO 补充编号 ========== +ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在"); +ErrorCode STUDENT_CONTACT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生联系人不存在"); +ErrorCode STUDENT_TEACHER_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生班主任不存在"); +ErrorCode STUDENT_TEACHER_EXISTS = new ErrorCode(TODO 补充编号, "学生班主任已存在"); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentContactDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentContactMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentContactMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentPageReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentPageReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentPageReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentSaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentSaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentSaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentTeacherDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/java/InfraStudentTeacherMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/java/InfraStudentTeacherMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/sql similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/sql index 4551d0de6..83df27926 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/sql/sql +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/sql/sql @@ -1,55 +1,55 @@ --- 菜单 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status, component_name -) -VALUES ( - '学生管理', '', 2, 0, 888, - 'student', '', 'infra/demo/index', 0, 'InfraStudent' -); - --- 按钮父菜单ID --- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生查询', 'infra:student:query', 3, 1, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生创建', 'infra:student:create', 3, 2, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生更新', 'infra:student:update', 3, 3, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生删除', 'infra:student:delete', 3, 4, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生导出', 'infra:student:export', 3, 5, @parentId, - '', '', '', 0 -); \ No newline at end of file +-- 菜单 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '学生管理', '', 2, 0, 888, + 'student', '', 'infra/demo/index', 0, 'InfraStudent' +); + +-- 按钮父菜单ID +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生查询', 'infra:student:query', 3, 1, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生创建', 'infra:student:create', 3, 2, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生更新', 'infra:student:update', 3, 3, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生删除', 'infra:student:delete', 3, 4, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生导出', 'infra:student:export', 3, 5, @parentId, + '', '', '', 0 +); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/ts/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/ts/index similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/ts/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/ts/index index 41eb94dd6..2fe87b741 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/ts/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/ts/index @@ -1,95 +1,95 @@ -import request from '@/config/axios' - -export interface StudentVO { - id: number - name: string - description: string - birthday: Date - sex: number - enabled: boolean - avatar: string - video: string - memo: string -} - -// 查询学生分页 -export const getStudentPage = async (params) => { - return await request.get({ url: `/infra/student/page`, params }) -} - -// 查询学生详情 -export const getStudent = async (id: number) => { - return await request.get({ url: `/infra/student/get?id=` + id }) -} - -// 新增学生 -export const createStudent = async (data: StudentVO) => { - return await request.post({ url: `/infra/student/create`, data }) -} - -// 修改学生 -export const updateStudent = async (data: StudentVO) => { - return await request.put({ url: `/infra/student/update`, data }) -} - -// 删除学生 -export const deleteStudent = async (id: number) => { - return await request.delete({ url: `/infra/student/delete?id=` + id }) -} - -// 导出学生 Excel -export const exportStudent = async (params) => { - return await request.download({ url: `/infra/student/export-excel`, params }) -} - -// ==================== 子表（学生联系人） ==================== - -// 获得学生联系人分页 -export const getStudentContactPage = async (params) => { - return await request.get({ url: `/infra/student/student-contact/page`, params }) -} -// 新增学生联系人 -export const createStudentContact = async (data) => { - return await request.post({ url: `/infra/student/student-contact/create`, data }) -} - -// 修改学生联系人 -export const updateStudentContact = async (data) => { - return await request.put({ url: `/infra/student/student-contact/update`, data }) -} - -// 删除学生联系人 -export const deleteStudentContact = async (id: number) => { - return await request.delete({ url: `/infra/student/student-contact/delete?id=` + id }) -} - -// 获得学生联系人 -export const getStudentContact = async (id: number) => { - return await request.get({ url: `/infra/student/student-contact/get?id=` + id }) -} - -// ==================== 子表（学生班主任） ==================== - -// 获得学生班主任分页 -export const getStudentTeacherPage = async (params) => { - return await request.get({ url: `/infra/student/student-teacher/page`, params }) -} -// 新增学生班主任 -export const createStudentTeacher = async (data) => { - return await request.post({ url: `/infra/student/student-teacher/create`, data }) -} - -// 修改学生班主任 -export const updateStudentTeacher = async (data) => { - return await request.put({ url: `/infra/student/student-teacher/update`, data }) -} - -// 删除学生班主任 -export const deleteStudentTeacher = async (id: number) => { - return await request.delete({ url: `/infra/student/student-teacher/delete?id=` + id }) -} - -// 获得学生班主任 -export const getStudentTeacher = async (id: number) => { - return await request.get({ url: `/infra/student/student-teacher/get?id=` + id }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface StudentVO { + id: number + name: string + description: string + birthday: Date + sex: number + enabled: boolean + avatar: string + video: string + memo: string +} + +// 查询学生分页 +export const getStudentPage = async (params) => { + return await request.get({ url: `/infra/student/page`, params }) +} + +// 查询学生详情 +export const getStudent = async (id: number) => { + return await request.get({ url: `/infra/student/get?id=` + id }) +} + +// 新增学生 +export const createStudent = async (data: StudentVO) => { + return await request.post({ url: `/infra/student/create`, data }) +} + +// 修改学生 +export const updateStudent = async (data: StudentVO) => { + return await request.put({ url: `/infra/student/update`, data }) +} + +// 删除学生 +export const deleteStudent = async (id: number) => { + return await request.delete({ url: `/infra/student/delete?id=` + id }) +} + +// 导出学生 Excel +export const exportStudent = async (params) => { + return await request.download({ url: `/infra/student/export-excel`, params }) +} + +// ==================== 子表（学生联系人） ==================== + +// 获得学生联系人分页 +export const getStudentContactPage = async (params) => { + return await request.get({ url: `/infra/student/student-contact/page`, params }) +} +// 新增学生联系人 +export const createStudentContact = async (data) => { + return await request.post({ url: `/infra/student/student-contact/create`, data }) +} + +// 修改学生联系人 +export const updateStudentContact = async (data) => { + return await request.put({ url: `/infra/student/student-contact/update`, data }) +} + +// 删除学生联系人 +export const deleteStudentContact = async (id: number) => { + return await request.delete({ url: `/infra/student/student-contact/delete?id=` + id }) +} + +// 获得学生联系人 +export const getStudentContact = async (id: number) => { + return await request.get({ url: `/infra/student/student-contact/get?id=` + id }) +} + +// ==================== 子表（学生班主任） ==================== + +// 获得学生班主任分页 +export const getStudentTeacherPage = async (params) => { + return await request.get({ url: `/infra/student/student-teacher/page`, params }) +} +// 新增学生班主任 +export const createStudentTeacher = async (data) => { + return await request.post({ url: `/infra/student/student-teacher/create`, data }) +} + +// 修改学生班主任 +export const updateStudentTeacher = async (data) => { + return await request.put({ url: `/infra/student/student-teacher/update`, data }) +} + +// 删除学生班主任 +export const deleteStudentTeacher = async (id: number) => { + return await request.delete({ url: `/infra/student/student-teacher/delete?id=` + id }) +} + +// 获得学生班主任 +export const getStudentTeacher = async (id: number) => { + return await request.get({ url: `/infra/student/student-teacher/get?id=` + id }) +} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactForm similarity index 98% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentContactForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactForm index 3c98b67fa..4a139355d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentContactForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactForm @@ -79,7 +79,7 @@ const formData = ref({ enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, }) const formRules = reactive({ studentId: [{ required: true, message: '学生编号不能为空', trigger: 'blur' }], @@ -89,7 +89,7 @@ const formRules = reactive({ sex: [{ required: true, message: '性别不能为空', trigger: 'change' }], enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref @@ -148,7 +148,7 @@ const resetForm = () => { enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, } formRef.value?.resetFields() } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentContactList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactList similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentContactList rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentContactList diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentForm similarity index 98% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/vue/StudentForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentForm index 2e3fc0387..0dabcb5f3 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/vue/StudentForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentForm @@ -78,7 +78,7 @@ const formData = ref({ enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, }) const formRules = reactive({ name: [{ required: true, message: '名字不能为空', trigger: 'blur' }], @@ -88,7 +88,7 @@ const formRules = reactive({ enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], video: [{ required: true, message: '附件不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref @@ -145,7 +145,7 @@ const resetForm = () => { enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, } formRef.value?.resetFields() } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherForm similarity index 98% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentTeacherForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherForm index 242fd57f5..f93c21c41 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentTeacherForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherForm @@ -79,7 +79,7 @@ const formData = ref({ enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, }) const formRules = reactive({ studentId: [{ required: true, message: '学生编号不能为空', trigger: 'blur' }], @@ -89,7 +89,7 @@ const formRules = reactive({ sex: [{ required: true, message: '性别不能为空', trigger: 'change' }], enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref @@ -148,7 +148,7 @@ const resetForm = () => { enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, } formRef.value?.resetFields() } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentTeacherList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherList similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentTeacherList rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/StudentTeacherList diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/index similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/index index c23fe4392..9d1514612 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/vue/index @@ -202,7 +202,7 @@ const queryParams = reactive({ birthday: [], sex: undefined, enabled: undefined, - createTime: [] + createTime: [], }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/xml/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/xml/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_erp/xml/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/assert.json similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/assert.json diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/ErrorCodeConstants_手动操作 similarity index 93% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/ErrorCodeConstants_手动操作 index 72162a859..f8be66202 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/ErrorCodeConstants_手动操作 +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/ErrorCodeConstants_手动操作 @@ -1,3 +1,3 @@ -// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ -// ========== 学生 TODO 补充编号 ========== -ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在"); \ No newline at end of file +// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ +// ========== 学生 TODO 补充编号 ========== +ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在"); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentContactDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentContactMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentContactMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentPageReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentPageReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentPageReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentSaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentSaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentSaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentTeacherDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/java/InfraStudentTeacherMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/java/InfraStudentTeacherMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/sql similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/sql index 4551d0de6..83df27926 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/sql/sql +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/sql/sql @@ -1,55 +1,55 @@ --- 菜单 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status, component_name -) -VALUES ( - '学生管理', '', 2, 0, 888, - 'student', '', 'infra/demo/index', 0, 'InfraStudent' -); - --- 按钮父菜单ID --- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生查询', 'infra:student:query', 3, 1, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生创建', 'infra:student:create', 3, 2, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生更新', 'infra:student:update', 3, 3, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生删除', 'infra:student:delete', 3, 4, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生导出', 'infra:student:export', 3, 5, @parentId, - '', '', '', 0 -); \ No newline at end of file +-- 菜单 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '学生管理', '', 2, 0, 888, + 'student', '', 'infra/demo/index', 0, 'InfraStudent' +); + +-- 按钮父菜单ID +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生查询', 'infra:student:query', 3, 1, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生创建', 'infra:student:create', 3, 2, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生更新', 'infra:student:update', 3, 3, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生删除', 'infra:student:delete', 3, 4, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生导出', 'infra:student:export', 3, 5, @parentId, + '', '', '', 0 +); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/ts/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/ts/index similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/ts/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/ts/index index 6afca54c3..6112800a9 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/ts/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/ts/index @@ -1,57 +1,57 @@ -import request from '@/config/axios' - -export interface StudentVO { - id: number - name: string - description: string - birthday: Date - sex: number - enabled: boolean - avatar: string - video: string - memo: string -} - -// 查询学生分页 -export const getStudentPage = async (params) => { - return await request.get({ url: `/infra/student/page`, params }) -} - -// 查询学生详情 -export const getStudent = async (id: number) => { - return await request.get({ url: `/infra/student/get?id=` + id }) -} - -// 新增学生 -export const createStudent = async (data: StudentVO) => { - return await request.post({ url: `/infra/student/create`, data }) -} - -// 修改学生 -export const updateStudent = async (data: StudentVO) => { - return await request.put({ url: `/infra/student/update`, data }) -} - -// 删除学生 -export const deleteStudent = async (id: number) => { - return await request.delete({ url: `/infra/student/delete?id=` + id }) -} - -// 导出学生 Excel -export const exportStudent = async (params) => { - return await request.download({ url: `/infra/student/export-excel`, params }) -} - -// ==================== 子表（学生联系人） ==================== - -// 获得学生联系人列表 -export const getStudentContactListByStudentId = async (studentId) => { - return await request.get({ url: `/infra/student/student-contact/list-by-student-id?studentId=` + studentId }) -} - -// ==================== 子表（学生班主任） ==================== - -// 获得学生班主任 -export const getStudentTeacherByStudentId = async (studentId) => { - return await request.get({ url: `/infra/student/student-teacher/get-by-student-id?studentId=` + studentId }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface StudentVO { + id: number + name: string + description: string + birthday: Date + sex: number + enabled: boolean + avatar: string + video: string + memo: string +} + +// 查询学生分页 +export const getStudentPage = async (params) => { + return await request.get({ url: `/infra/student/page`, params }) +} + +// 查询学生详情 +export const getStudent = async (id: number) => { + return await request.get({ url: `/infra/student/get?id=` + id }) +} + +// 新增学生 +export const createStudent = async (data: StudentVO) => { + return await request.post({ url: `/infra/student/create`, data }) +} + +// 修改学生 +export const updateStudent = async (data: StudentVO) => { + return await request.put({ url: `/infra/student/update`, data }) +} + +// 删除学生 +export const deleteStudent = async (id: number) => { + return await request.delete({ url: `/infra/student/delete?id=` + id }) +} + +// 导出学生 Excel +export const exportStudent = async (params) => { + return await request.download({ url: `/infra/student/export-excel`, params }) +} + +// ==================== 子表（学生联系人） ==================== + +// 获得学生联系人列表 +export const getStudentContactListByStudentId = async (studentId) => { + return await request.get({ url: `/infra/student/student-contact/list-by-student-id?studentId=` + studentId }) +} + +// ==================== 子表（学生班主任） ==================== + +// 获得学生班主任 +export const getStudentTeacherByStudentId = async (studentId) => { + return await request.get({ url: `/infra/student/student-teacher/get-by-student-id?studentId=` + studentId }) +} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactForm similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentContactForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactForm index 20f129e5b..55ca9945e 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentContactForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactForm @@ -113,7 +113,7 @@ const formRules = reactive({ sex: [{ required: true, message: '性别不能为空', trigger: 'change' }], enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref @@ -149,7 +149,7 @@ const handleAdd = () => { enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, } row.studentId = props.studentId formData.value.push(row) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentContactList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactList similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentContactList rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentContactList diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentForm similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentForm index d77df42d9..d8e7bc3d0 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentForm @@ -89,7 +89,7 @@ const formData = ref({ enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, }) const formRules = reactive({ name: [{ required: true, message: '名字不能为空', trigger: 'blur' }], @@ -99,7 +99,7 @@ const formRules = reactive({ enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], video: [{ required: true, message: '附件不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref @@ -177,7 +177,7 @@ const resetForm = () => { enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, } formRef.value?.resetFields() } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherForm similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentTeacherForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherForm index 6027db882..b22a4801f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentTeacherForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherForm @@ -69,7 +69,7 @@ const formRules = reactive({ sex: [{ required: true, message: '性别不能为空', trigger: 'change' }], enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentTeacherList b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherList similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentTeacherList rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/StudentTeacherList diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/index similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/index index 5bbb69b77..ee7c05f1f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/vue/index @@ -197,7 +197,7 @@ const queryParams = reactive({ birthday: [], sex: undefined, enabled: undefined, - createTime: [] + createTime: [], }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/xml/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/xml/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_inner/xml/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/assert.json similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/assert.json diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/ErrorCodeConstants_手动操作 similarity index 93% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/ErrorCodeConstants_手动操作 index 72162a859..f8be66202 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/ErrorCodeConstants_手动操作 +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/ErrorCodeConstants_手动操作 @@ -1,3 +1,3 @@ -// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ -// ========== 学生 TODO 补充编号 ========== -ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在"); \ No newline at end of file +// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ +// ========== 学生 TODO 补充编号 ========== +ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在"); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentContactDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentContactDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentContactMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentContactMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentContactMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentPageReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentPageReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentPageReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentSaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentSaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentSaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentTeacherDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentTeacherDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentTeacherMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/java/InfraStudentTeacherMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/java/InfraStudentTeacherMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/sql similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/sql index 4551d0de6..83df27926 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/sql/sql +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/sql/sql @@ -1,55 +1,55 @@ --- 菜单 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status, component_name -) -VALUES ( - '学生管理', '', 2, 0, 888, - 'student', '', 'infra/demo/index', 0, 'InfraStudent' -); - --- 按钮父菜单ID --- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生查询', 'infra:student:query', 3, 1, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生创建', 'infra:student:create', 3, 2, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生更新', 'infra:student:update', 3, 3, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生删除', 'infra:student:delete', 3, 4, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生导出', 'infra:student:export', 3, 5, @parentId, - '', '', '', 0 -); \ No newline at end of file +-- 菜单 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '学生管理', '', 2, 0, 888, + 'student', '', 'infra/demo/index', 0, 'InfraStudent' +); + +-- 按钮父菜单ID +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生查询', 'infra:student:query', 3, 1, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生创建', 'infra:student:create', 3, 2, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生更新', 'infra:student:update', 3, 3, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生删除', 'infra:student:delete', 3, 4, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生导出', 'infra:student:export', 3, 5, @parentId, + '', '', '', 0 +); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/ts/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/ts/index similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/ts/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/ts/index index 6afca54c3..6112800a9 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/ts/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/ts/index @@ -1,57 +1,57 @@ -import request from '@/config/axios' - -export interface StudentVO { - id: number - name: string - description: string - birthday: Date - sex: number - enabled: boolean - avatar: string - video: string - memo: string -} - -// 查询学生分页 -export const getStudentPage = async (params) => { - return await request.get({ url: `/infra/student/page`, params }) -} - -// 查询学生详情 -export const getStudent = async (id: number) => { - return await request.get({ url: `/infra/student/get?id=` + id }) -} - -// 新增学生 -export const createStudent = async (data: StudentVO) => { - return await request.post({ url: `/infra/student/create`, data }) -} - -// 修改学生 -export const updateStudent = async (data: StudentVO) => { - return await request.put({ url: `/infra/student/update`, data }) -} - -// 删除学生 -export const deleteStudent = async (id: number) => { - return await request.delete({ url: `/infra/student/delete?id=` + id }) -} - -// 导出学生 Excel -export const exportStudent = async (params) => { - return await request.download({ url: `/infra/student/export-excel`, params }) -} - -// ==================== 子表（学生联系人） ==================== - -// 获得学生联系人列表 -export const getStudentContactListByStudentId = async (studentId) => { - return await request.get({ url: `/infra/student/student-contact/list-by-student-id?studentId=` + studentId }) -} - -// ==================== 子表（学生班主任） ==================== - -// 获得学生班主任 -export const getStudentTeacherByStudentId = async (studentId) => { - return await request.get({ url: `/infra/student/student-teacher/get-by-student-id?studentId=` + studentId }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface StudentVO { + id: number + name: string + description: string + birthday: Date + sex: number + enabled: boolean + avatar: string + video: string + memo: string +} + +// 查询学生分页 +export const getStudentPage = async (params) => { + return await request.get({ url: `/infra/student/page`, params }) +} + +// 查询学生详情 +export const getStudent = async (id: number) => { + return await request.get({ url: `/infra/student/get?id=` + id }) +} + +// 新增学生 +export const createStudent = async (data: StudentVO) => { + return await request.post({ url: `/infra/student/create`, data }) +} + +// 修改学生 +export const updateStudent = async (data: StudentVO) => { + return await request.put({ url: `/infra/student/update`, data }) +} + +// 删除学生 +export const deleteStudent = async (id: number) => { + return await request.delete({ url: `/infra/student/delete?id=` + id }) +} + +// 导出学生 Excel +export const exportStudent = async (params) => { + return await request.download({ url: `/infra/student/export-excel`, params }) +} + +// ==================== 子表（学生联系人） ==================== + +// 获得学生联系人列表 +export const getStudentContactListByStudentId = async (studentId) => { + return await request.get({ url: `/infra/student/student-contact/list-by-student-id?studentId=` + studentId }) +} + +// ==================== 子表（学生班主任） ==================== + +// 获得学生班主任 +export const getStudentTeacherByStudentId = async (studentId) => { + return await request.get({ url: `/infra/student/student-teacher/get-by-student-id?studentId=` + studentId }) +} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentContactForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentContactForm similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentContactForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentContactForm index 20f129e5b..55ca9945e 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentContactForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentContactForm @@ -113,7 +113,7 @@ const formRules = reactive({ sex: [{ required: true, message: '性别不能为空', trigger: 'change' }], enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref @@ -149,7 +149,7 @@ const handleAdd = () => { enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, } row.studentId = props.studentId formData.value.push(row) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentForm similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentForm index d77df42d9..d8e7bc3d0 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_inner/vue/StudentForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentForm @@ -89,7 +89,7 @@ const formData = ref({ enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, }) const formRules = reactive({ name: [{ required: true, message: '名字不能为空', trigger: 'blur' }], @@ -99,7 +99,7 @@ const formRules = reactive({ enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], video: [{ required: true, message: '附件不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref @@ -177,7 +177,7 @@ const resetForm = () => { enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, } formRef.value?.resetFields() } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentTeacherForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentTeacherForm similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentTeacherForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentTeacherForm index 6027db882..b22a4801f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/StudentTeacherForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/StudentTeacherForm @@ -69,7 +69,7 @@ const formRules = reactive({ sex: [{ required: true, message: '性别不能为空', trigger: 'change' }], enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/index similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/index index 4a65d8c3d..b115b13de 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/vue/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/vue/index @@ -182,7 +182,7 @@ const queryParams = reactive({ birthday: [], sex: undefined, enabled: undefined, - createTime: [] + createTime: [], }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/xml/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_normal/xml/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_master_normal/xml/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/assert.json similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/assert.json diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/ErrorCodeConstants_手动操作 similarity index 93% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/ErrorCodeConstants_手动操作 index 72162a859..f8be66202 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/ErrorCodeConstants_手动操作 +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/ErrorCodeConstants_手动操作 @@ -1,3 +1,3 @@ -// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ -// ========== 学生 TODO 补充编号 ========== -ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在"); \ No newline at end of file +// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ +// ========== 学生 TODO 补充编号 ========== +ErrorCode STUDENT_NOT_EXISTS = new ErrorCode(TODO 补充编号, "学生不存在"); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentPageReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentPageReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentPageReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentPageReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentSaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentSaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentSaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/java/InfraStudentServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/sql similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/sql index 4551d0de6..83df27926 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/sql/sql +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/sql/sql @@ -1,55 +1,55 @@ --- 菜单 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status, component_name -) -VALUES ( - '学生管理', '', 2, 0, 888, - 'student', '', 'infra/demo/index', 0, 'InfraStudent' -); - --- 按钮父菜单ID --- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生查询', 'infra:student:query', 3, 1, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生创建', 'infra:student:create', 3, 2, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生更新', 'infra:student:update', 3, 3, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生删除', 'infra:student:delete', 3, 4, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '学生导出', 'infra:student:export', 3, 5, @parentId, - '', '', '', 0 -); \ No newline at end of file +-- 菜单 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '学生管理', '', 2, 0, 888, + 'student', '', 'infra/demo/index', 0, 'InfraStudent' +); + +-- 按钮父菜单ID +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生查询', 'infra:student:query', 3, 1, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生创建', 'infra:student:create', 3, 2, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生更新', 'infra:student:update', 3, 3, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生删除', 'infra:student:delete', 3, 4, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '学生导出', 'infra:student:export', 3, 5, @parentId, + '', '', '', 0 +); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/ts/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/ts/index similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/ts/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/ts/index index 1ac86e52f..8cdf2548d 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/ts/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/ts/index @@ -1,43 +1,43 @@ -import request from '@/config/axios' - -export interface StudentVO { - id: number - name: string - description: string - birthday: Date - sex: number - enabled: boolean - avatar: string - video: string - memo: string -} - -// 查询学生分页 -export const getStudentPage = async (params) => { - return await request.get({ url: `/infra/student/page`, params }) -} - -// 查询学生详情 -export const getStudent = async (id: number) => { - return await request.get({ url: `/infra/student/get?id=` + id }) -} - -// 新增学生 -export const createStudent = async (data: StudentVO) => { - return await request.post({ url: `/infra/student/create`, data }) -} - -// 修改学生 -export const updateStudent = async (data: StudentVO) => { - return await request.put({ url: `/infra/student/update`, data }) -} - -// 删除学生 -export const deleteStudent = async (id: number) => { - return await request.delete({ url: `/infra/student/delete?id=` + id }) -} - -// 导出学生 Excel -export const exportStudent = async (params) => { - return await request.download({ url: `/infra/student/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface StudentVO { + id: number + name: string + description: string + birthday: Date + sex: number + enabled: boolean + avatar: string + video: string + memo: string +} + +// 查询学生分页 +export const getStudentPage = async (params) => { + return await request.get({ url: `/infra/student/page`, params }) +} + +// 查询学生详情 +export const getStudent = async (id: number) => { + return await request.get({ url: `/infra/student/get?id=` + id }) +} + +// 新增学生 +export const createStudent = async (data: StudentVO) => { + return await request.post({ url: `/infra/student/create`, data }) +} + +// 修改学生 +export const updateStudent = async (data: StudentVO) => { + return await request.put({ url: `/infra/student/update`, data }) +} + +// 删除学生 +export const deleteStudent = async (id: number) => { + return await request.delete({ url: `/infra/student/delete?id=` + id }) +} + +// 导出学生 Excel +export const exportStudent = async (params) => { + return await request.download({ url: `/infra/student/export-excel`, params }) +} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/StudentForm similarity index 98% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/StudentForm index 2e3fc0387..0dabcb5f3 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_master_erp/vue/StudentForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/StudentForm @@ -78,7 +78,7 @@ const formData = ref({ enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, }) const formRules = reactive({ name: [{ required: true, message: '名字不能为空', trigger: 'blur' }], @@ -88,7 +88,7 @@ const formRules = reactive({ enabled: [{ required: true, message: '是否有效不能为空', trigger: 'blur' }], avatar: [{ required: true, message: '头像不能为空', trigger: 'blur' }], video: [{ required: true, message: '附件不能为空', trigger: 'blur' }], - memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }] + memo: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref @@ -145,7 +145,7 @@ const resetForm = () => { enabled: undefined, avatar: undefined, video: undefined, - memo: undefined + memo: undefined, } formRef.value?.resetFields() } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/index similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/index index 4a65d8c3d..b115b13de 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/vue/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/vue/index @@ -182,7 +182,7 @@ const queryParams = reactive({ birthday: [], sex: undefined, enabled: undefined, - createTime: [] + createTime: [], }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/xml/InfraStudentMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/xml/InfraStudentMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_one/xml/InfraStudentMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_one/xml/InfraStudentMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/assert.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/assert.json similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/assert.json rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/assert.json diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/ErrorCodeConstants_手动操作 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/ErrorCodeConstants_手动操作 similarity index 98% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/ErrorCodeConstants_手动操作 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/ErrorCodeConstants_手动操作 index a8626bdda..36df6752e 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/ErrorCodeConstants_手动操作 +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/ErrorCodeConstants_手动操作 @@ -1,8 +1,8 @@ -// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ -// ========== 分类 TODO 补充编号 ========== -ErrorCode CATEGORY_NOT_EXISTS = new ErrorCode(TODO 补充编号, "分类不存在"); -ErrorCode CATEGORY_EXITS_CHILDREN = new ErrorCode(TODO 补充编号, "存在存在子分类，无法删除"); -ErrorCode CATEGORY_PARENT_NOT_EXITS = new ErrorCode(TODO 补充编号,"父级分类不存在"); -ErrorCode CATEGORY_PARENT_ERROR = new ErrorCode(TODO 补充编号, "不能设置自己为父分类"); -ErrorCode CATEGORY_NAME_DUPLICATE = new ErrorCode(TODO 补充编号, "已经存在该名字的分类"); -ErrorCode CATEGORY_PARENT_IS_CHILD = new ErrorCode(TODO 补充编号, "不能设置自己的子InfraCategory为父InfraCategory"); \ No newline at end of file +// TODO 待办：请将下面的错误码复制到 yudao-module-infra-api 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！ +// ========== 分类 TODO 补充编号 ========== +ErrorCode CATEGORY_NOT_EXISTS = new ErrorCode(TODO 补充编号, "分类不存在"); +ErrorCode CATEGORY_EXITS_CHILDREN = new ErrorCode(TODO 补充编号, "存在存在子分类，无法删除"); +ErrorCode CATEGORY_PARENT_NOT_EXITS = new ErrorCode(TODO 补充编号,"父级分类不存在"); +ErrorCode CATEGORY_PARENT_ERROR = new ErrorCode(TODO 补充编号, "不能设置自己为父分类"); +ErrorCode CATEGORY_NAME_DUPLICATE = new ErrorCode(TODO 补充编号, "已经存在该名字的分类"); +ErrorCode CATEGORY_PARENT_IS_CHILD = new ErrorCode(TODO 补充编号, "不能设置自己的子InfraCategory为父InfraCategory"); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryController similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryController rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryController diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryDO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryDO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryDO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryDO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryListReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryListReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryListReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryListReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryMapper diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryRespVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryRespVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryRespVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryRespVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategorySaveReqVO similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategorySaveReqVO rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategorySaveReqVO diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryService similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryService rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryService diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImpl similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImpl rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImpl diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImplTest similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImplTest rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/java/InfraCategoryServiceImplTest diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/sql/h2 b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/h2 similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/sql/h2 rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/h2 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/sql/sql b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/sql similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/sql/sql rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/sql index 01bf99057..81409488a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/sql/sql +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/sql/sql @@ -1,55 +1,55 @@ --- 菜单 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status, component_name -) -VALUES ( - '分类管理', '', 2, 0, 888, - 'category', '', 'infra/demo/index', 0, 'InfraCategory' -); - --- 按钮父菜单ID --- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '分类查询', 'infra:category:query', 3, 1, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '分类创建', 'infra:category:create', 3, 2, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '分类更新', 'infra:category:update', 3, 3, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '分类删除', 'infra:category:delete', 3, 4, @parentId, - '', '', '', 0 -); -INSERT INTO system_menu( - name, permission, type, sort, parent_id, - path, icon, component, status -) -VALUES ( - '分类导出', 'infra:category:export', 3, 5, @parentId, - '', '', '', 0 -); \ No newline at end of file +-- 菜单 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status, component_name +) +VALUES ( + '分类管理', '', 2, 0, 888, + 'category', '', 'infra/demo/index', 0, 'InfraCategory' +); + +-- 按钮父菜单ID +-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码 +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '分类查询', 'infra:category:query', 3, 1, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '分类创建', 'infra:category:create', 3, 2, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '分类更新', 'infra:category:update', 3, 3, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '分类删除', 'infra:category:delete', 3, 4, @parentId, + '', '', '', 0 +); +INSERT INTO system_menu( + name, permission, type, sort, parent_id, + path, icon, component, status +) +VALUES ( + '分类导出', 'infra:category:export', 3, 5, @parentId, + '', '', '', 0 +); \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/ts/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/ts/index similarity index 96% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/ts/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/ts/index index 5f81a63d8..453c885c1 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/ts/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/ts/index @@ -1,37 +1,37 @@ -import request from '@/config/axios' - -export interface CategoryVO { - id: number - name: string - parentId: number -} - -// 查询分类列表 -export const getCategoryList = async (params) => { - return await request.get({ url: `/infra/category/list`, params }) -} - -// 查询分类详情 -export const getCategory = async (id: number) => { - return await request.get({ url: `/infra/category/get?id=` + id }) -} - -// 新增分类 -export const createCategory = async (data: CategoryVO) => { - return await request.post({ url: `/infra/category/create`, data }) -} - -// 修改分类 -export const updateCategory = async (data: CategoryVO) => { - return await request.put({ url: `/infra/category/update`, data }) -} - -// 删除分类 -export const deleteCategory = async (id: number) => { - return await request.delete({ url: `/infra/category/delete?id=` + id }) -} - -// 导出分类 Excel -export const exportCategory = async (params) => { - return await request.download({ url: `/infra/category/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface CategoryVO { + id: number + name: string + parentId: number +} + +// 查询分类列表 +export const getCategoryList = async (params) => { + return await request.get({ url: `/infra/category/list`, params }) +} + +// 查询分类详情 +export const getCategory = async (id: number) => { + return await request.get({ url: `/infra/category/get?id=` + id }) +} + +// 新增分类 +export const createCategory = async (data: CategoryVO) => { + return await request.post({ url: `/infra/category/create`, data }) +} + +// 修改分类 +export const updateCategory = async (data: CategoryVO) => { + return await request.put({ url: `/infra/category/update`, data }) +} + +// 删除分类 +export const deleteCategory = async (id: number) => { + return await request.delete({ url: `/infra/category/delete?id=` + id }) +} + +// 导出分类 Excel +export const exportCategory = async (params) => { + return await request.download({ url: `/infra/category/export-excel`, params }) +} \ No newline at end of file diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/vue/CategoryForm b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/CategoryForm similarity index 97% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/vue/CategoryForm rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/CategoryForm index 90143c8d8..8e139fb13 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/vue/CategoryForm +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/CategoryForm @@ -41,11 +41,11 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formData = ref({ id: undefined, name: undefined, - parentId: undefined + parentId: undefined, }) const formRules = reactive({ name: [{ required: true, message: '名字不能为空', trigger: 'blur' }], - parentId: [{ required: true, message: '父编号不能为空', trigger: 'blur' }] + parentId: [{ required: true, message: '父编号不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref const categoryTree = ref() // 树形结构 @@ -98,7 +98,7 @@ const resetForm = () => { formData.value = { id: undefined, name: undefined, - parentId: undefined + parentId: undefined, } formRef.value?.resetFields() } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/vue/index b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/index similarity index 99% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/vue/index rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/index index 6db6b152a..46902e73c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/vue/index +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/vue/index @@ -106,7 +106,7 @@ const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 const list = ref([]) // 列表的数据 const queryParams = reactive({ - name: undefined + name: undefined, }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/xml/InfraCategoryMapper b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/xml/InfraCategoryMapper similarity index 100% rename from yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/vue3_tree/xml/InfraCategoryMapper rename to yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/windows10/vue3_tree/xml/InfraCategoryMapper From c9482452e3449a4f2a71f1366cca6be88a0a9350 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 6 Dec 2023 21:27:13 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=90=9B=20=E7=A6=81=E7=94=A8=20Codegen?= =?UTF-8?q?EngineVue3Test=20=E6=9A=82=E6=97=B6=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E5=8D=95=E6=B5=8B=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codegen/inner/CodegenEngineAbstractTest.java | 12 +++++++----- .../service/codegen/inner/CodegenEngineVue3Test.java | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java index f8b778e30..5176af1c7 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineAbstractTest.java @@ -31,8 +31,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { - public String resourcesPath = ""; // 测试文件资源目录 - public static final String OS_NAME = System.getProperty("os.name").toLowerCase().replace(" ", ""); // 操作系统名称 + /** + * 测试文件资源目录 + */ + private String resourcesPath = ""; @InjectMocks protected CodegenEngine codegenEngine; @@ -47,7 +49,7 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { // 获取测试文件 resources 路径 String absolutePath = FileUtil.getAbsolutePath("application-unit-test.yaml"); // 系统不一样生成的文件也有差异，那就各自生成各自的 - resourcesPath = absolutePath.split("/target")[0] + "/src/test/resources/codegen/" + OS_NAME; + resourcesPath = absolutePath.split("/target")[0] + "/src/test/resources/codegen/"; } protected static CodegenTableDO getTable(String name) { @@ -80,14 +82,14 @@ public abstract class CodegenEngineAbstractTest extends BaseMockitoUnitTest { @SuppressWarnings("rawtypes") protected static void assertResult(Map result, String path) { - String assertContent = ResourceUtil.readUtf8Str("codegen/" + OS_NAME + path + "/assert.json"); + String assertContent = ResourceUtil.readUtf8Str("codegen/" + path + "/assert.json"); List asserts = JsonUtils.parseArray(assertContent, HashMap.class); assertEquals(asserts.size(), result.size()); // 校验每个文件 asserts.forEach(assertMap -> { String contentPath = (String) assertMap.get("contentPath"); String filePath = (String) assertMap.get("filePath"); - String content = ResourceUtil.readUtf8Str("codegen/" + OS_NAME + path + "/" + contentPath); + String content = ResourceUtil.readUtf8Str("codegen/" + path + "/" + contentPath); assertEquals(content, result.get(filePath), filePath + "：不匹配"); }); } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java index ce745c910..4684db78c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO; import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO; import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum; import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -15,6 +16,7 @@ import java.util.Map; * * @author 芋道源码 */ +@Disabled public class CodegenEngineVue3Test extends CodegenEngineAbstractTest { @Test From 85994b69205ba31971ea30d201c19a162fe7937a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 6 Dec 2023 21:30:11 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20Spring?= =?UTF-8?q?=20Cache=20Redis=20=E5=8D=95=E5=86=92=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E5=8F=8C=20::=20=E5=86=92=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=20Redis=20Desktop=20Manager=20?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/config/YudaoCacheAutoConfiguration.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java index 2797e2117..9e84c4a49 100644 --- a/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java +++ b/yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoCacheAutoConfiguration.java @@ -15,6 +15,7 @@ import org.springframework.data.redis.cache.RedisCacheWriter; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.util.StringUtils; import java.util.Objects; @@ -39,7 +40,15 @@ public class YudaoCacheAutoConfiguration { RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig(); // 设置使用 : 单冒号，而不是双 :: 冒号，避免 Redis Desktop Manager 多余空格 // 详细可见 https://blog.csdn.net/chuixue24/article/details/103928965 博客 - config = config.computePrefixWith(cacheName -> cacheName + StrUtil.COLON); + // 再次修复单冒号，而不是双 :: 冒号问题，Issues 详情：https://gitee.com/zhijiantianya/yudao-cloud/issues/I86VY2 + config = config.computePrefixWith(cacheName -> { + String keyPrefix = cacheProperties.getRedis().getKeyPrefix(); + if (StringUtils.hasText(keyPrefix)) { + keyPrefix = keyPrefix.lastIndexOf(StrUtil.COLON) == -1 ? keyPrefix + StrUtil.COLON : keyPrefix; + return keyPrefix + cacheName + StrUtil.COLON; + } + return cacheName + StrUtil.COLON; + }); // 设置使用 JSON 序列化方式 config = config.serializeValuesWith( RedisSerializationContext.SerializationPair.fromSerializer(buildRedisSerializer())); @@ -49,9 +58,6 @@ public class YudaoCacheAutoConfiguration { if (redisProperties.getTimeToLive() != null) { config = config.entryTtl(redisProperties.getTimeToLive()); } - if (redisProperties.getKeyPrefix() != null) { - config = config.prefixCacheNameWith(redisProperties.getKeyPrefix()); - } if (!redisProperties.isCacheNullValues()) { config = config.disableCachingNullValues(); } From ea59975d541628addd0919537ddc8c673232e850 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 6 Dec 2023 22:03:54 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=94=A5=20gitattributes=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 3c200cd4a..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.sql linguist-language=java From f9fede3ea79b6823316e3e03a1b7c510fb951298 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 6 Dec 2023 22:11:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=9A=9A=20=E5=B0=86=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E7=BB=9F=E4=B8=80=E5=88=B0=20script?= =?UTF-8?q?=20=E7=9B=AE=E5=BD=95=E4=B8=8B=EF=BC=8C=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E6=A0=B9=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Docker-HOWTO.md => script/docker/Docker-HOWTO.md | 0 docker-compose.yml => script/docker/docker-compose.yml | 0 docker.env => script/docker/docker.env | 0 http-client.env.json => script/idea/http-client.env.json | 0 Jenkinsfile => script/jenkins/Jenkinsfile | 0 {bin => script/shell}/deploy.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename Docker-HOWTO.md => script/docker/Docker-HOWTO.md (100%) rename docker-compose.yml => script/docker/docker-compose.yml (100%) rename docker.env => script/docker/docker.env (100%) rename http-client.env.json => script/idea/http-client.env.json (100%) rename Jenkinsfile => script/jenkins/Jenkinsfile (100%) rename {bin => script/shell}/deploy.sh (100%) diff --git a/Docker-HOWTO.md b/ script/docker/Docker-HOWTO.md similarity index 100% rename from Docker-HOWTO.md rename to script/docker/Docker-HOWTO.md diff --git a/docker-compose.yml b/ script/docker/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to script/docker/docker-compose.yml diff --git a/docker.env b/ script/docker/docker.env similarity index 100% rename from docker.env rename to script/docker/docker.env diff --git a/http-client.env.json b/ script/idea/http-client.env.json similarity index 100% rename from http-client.env.json rename to script/idea/http-client.env.json diff --git a/Jenkinsfile b/ script/jenkins/Jenkinsfile similarity index 100% rename from Jenkinsfile rename to script/jenkins/Jenkinsfile diff --git a/bin/deploy.sh b/ script/shell/deploy.sh similarity index 100% rename from bin/deploy.sh rename to script/shell/deploy.sh From 090b1bcd458fe4352ecf1dc5ed66162c70b3209e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 6 Dec 2023 22:15:08 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=9A=9A=20=E5=B0=86=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E7=BB=9F=E4=B8=80=E5=88=B0=20script?= =?UTF-8?q?=20=E7=9B=AE=E5=BD=95=E4=B8=8B=EF=BC=8C=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E6=A0=B9=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- { script => script}/docker/Docker-HOWTO.md | 0 { script => script}/docker/docker-compose.yml | 0 { script => script}/docker/docker.env | 0 { script => script}/idea/http-client.env.json | 0 { script => script}/jenkins/Jenkinsfile | 0 { script => script}/shell/deploy.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename { script => script}/docker/Docker-HOWTO.md (100%) rename { script => script}/docker/docker-compose.yml (100%) rename { script => script}/docker/docker.env (100%) rename { script => script}/idea/http-client.env.json (100%) rename { script => script}/jenkins/Jenkinsfile (100%) rename { script => script}/shell/deploy.sh (100%) diff --git a/ script/docker/Docker-HOWTO.md b/script/docker/Docker-HOWTO.md similarity index 100% rename from script/docker/Docker-HOWTO.md rename to script/docker/Docker-HOWTO.md diff --git a/ script/docker/docker-compose.yml b/script/docker/docker-compose.yml similarity index 100% rename from script/docker/docker-compose.yml rename to script/docker/docker-compose.yml diff --git a/ script/docker/docker.env b/script/docker/docker.env similarity index 100% rename from script/docker/docker.env rename to script/docker/docker.env diff --git a/ script/idea/http-client.env.json b/script/idea/http-client.env.json similarity index 100% rename from script/idea/http-client.env.json rename to script/idea/http-client.env.json diff --git a/ script/jenkins/Jenkinsfile b/script/jenkins/Jenkinsfile similarity index 100% rename from script/jenkins/Jenkinsfile rename to script/jenkins/Jenkinsfile diff --git a/ script/shell/deploy.sh b/script/shell/deploy.sh similarity index 100% rename from script/shell/deploy.sh rename to script/shell/deploy.sh