From 0229fc67a0778cdf60ff68006a5615b4f28e00f5 Mon Sep 17 00:00:00 2001 From: canonical Date: Sun, 28 Jul 2024 21:35:10 +0800 Subject: [PATCH] =?UTF-8?q?meta=E4=B8=AD=E7=9A=84prop=E7=BC=BA=E7=9C=81?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AA?= =?UTF-8?q?=E8=AF=BB=EF=BC=8C=E9=9C=80=E8=A6=81=E6=98=BE=E5=BC=8F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AEinsertable=E5=92=8Cupdatable=E6=89=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E6=96=B0=E5=BB=BA=E5=92=8C=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=97=A0=E6=84=8F=E4=B8=AD=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E7=9A=84prop=E4=BA=A7=E7=94=9F=E5=AE=89=E5=85=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../testRollback/output/tables/nop_auth_role.csv | 1 + .../TestLoginApi/testLogin/input/tables/nop_auth_role.csv | 1 + .../testLogin2/input/tables/nop_auth_role.csv | 1 + .../testLoginLogout/input/tables/nop_auth_role.csv | 1 + .../java/io/nop/autotest/junit/JunitAutoTestCase.java | 3 +-- .../src/main/java/io/nop/orm/model/IColumnModel.java | 8 ++++++-- .../testSaveExtFields/output/response.json5 | 6 +++--- .../nop/sys/model/NopSysCodeRule/NopSysCodeRule.xmeta | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 nop-auth/nop-auth-service/cases/io/nop/auth/service/TestGraphQLTransaction/testRollback/output/tables/nop_auth_role.csv create mode 100644 nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin/input/tables/nop_auth_role.csv create mode 100644 nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin2/input/tables/nop_auth_role.csv create mode 100644 nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/tables/nop_auth_role.csv diff --git a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestGraphQLTransaction/testRollback/output/tables/nop_auth_role.csv b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestGraphQLTransaction/testRollback/output/tables/nop_auth_role.csv new file mode 100644 index 000000000..63f51eb39 --- /dev/null +++ b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestGraphQLTransaction/testRollback/output/tables/nop_auth_role.csv @@ -0,0 +1 @@ +_chgType,ROLE_ID,ROLE_NAME,CHILD_ROLE_IDS,IS_PRIMARY,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK diff --git a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin/input/tables/nop_auth_role.csv b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin/input/tables/nop_auth_role.csv new file mode 100644 index 000000000..69060e915 --- /dev/null +++ b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin/input/tables/nop_auth_role.csv @@ -0,0 +1 @@ +ROLE_ID,ROLE_NAME,CHILD_ROLE_IDS,IS_PRIMARY,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK diff --git a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin2/input/tables/nop_auth_role.csv b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin2/input/tables/nop_auth_role.csv new file mode 100644 index 000000000..69060e915 --- /dev/null +++ b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLogin2/input/tables/nop_auth_role.csv @@ -0,0 +1 @@ +ROLE_ID,ROLE_NAME,CHILD_ROLE_IDS,IS_PRIMARY,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK diff --git a/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/tables/nop_auth_role.csv b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/tables/nop_auth_role.csv new file mode 100644 index 000000000..69060e915 --- /dev/null +++ b/nop-auth/nop-auth-service/cases/io/nop/auth/service/TestLoginApi/testLoginLogout/input/tables/nop_auth_role.csv @@ -0,0 +1 @@ +ROLE_ID,ROLE_NAME,CHILD_ROLE_IDS,IS_PRIMARY,DEL_FLAG,VERSION,CREATED_BY,CREATE_TIME,UPDATED_BY,UPDATE_TIME,REMARK diff --git a/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/JunitAutoTestCase.java b/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/JunitAutoTestCase.java index 5c069bdbc..58d44d6e8 100644 --- a/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/JunitAutoTestCase.java +++ b/nop-autotest/nop-autotest-junit/src/main/java/io/nop/autotest/junit/JunitAutoTestCase.java @@ -9,7 +9,6 @@ import io.nop.api.core.annotations.autotest.EnableSnapshot; import io.nop.api.core.exceptions.ErrorCode; -import io.nop.api.core.util.Guard; import io.nop.autotest.core.AutoTestCase; import io.nop.autotest.core.data.AutoTestDataHelper; import org.junit.jupiter.api.AfterEach; @@ -104,7 +103,7 @@ protected void configExecutionMode(TestInfo testInfo) { protected String getCaseDataPath(TestInfo testInfo) { Class testClass = testInfo.getTestClass().orElse(null); Method testMethod = testInfo.getTestMethod().orElse(null); - if(testClass == null || testMethod == null) + if (testClass == null || testMethod == null) throw new IllegalArgumentException("null test info"); return AutoTestDataHelper.getTestDataPath(testClass, testMethod); } diff --git a/nop-orm-model/src/main/java/io/nop/orm/model/IColumnModel.java b/nop-orm-model/src/main/java/io/nop/orm/model/IColumnModel.java index 2ec8365be..36bc1c7e4 100644 --- a/nop-orm-model/src/main/java/io/nop/orm/model/IColumnModel.java +++ b/nop-orm-model/src/main/java/io/nop/orm/model/IColumnModel.java @@ -8,10 +8,11 @@ package io.nop.orm.model; import io.nop.commons.type.StdDataType; -import io.nop.commons.util.StringHelper; import io.nop.commons.type.StdSqlType; +import io.nop.commons.util.StringHelper; import java.util.List; +import java.util.Objects; public interface IColumnModel extends IEntityPropModel { @@ -20,7 +21,10 @@ public interface IColumnModel extends IEntityPropModel { String getDomain(); default String getBaseDomain() { - return StringHelper.firstPart(getDomain(), '-'); + String domain = getDomain(); + if (Objects.equals(domain, getStdDomain())) + return domain; + return StringHelper.firstPart(domain, '-'); } String getStdDomain(); diff --git a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/response.json5 b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/response.json5 index be0107b9e..f57b84891 100644 --- a/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/response.json5 +++ b/nop-sys/nop-sys-service/cases/io/nop/sys/service/TestDynamicExtFields/testSaveExtFields/output/response.json5 @@ -1,5 +1,6 @@ { "data": { + "id": "@var:NopSysExtField@entityId", "sid": "@var:NopSysExtField@entityId", "name": "abc", "displayName": "XXX", @@ -7,10 +8,9 @@ "delFlag": 0, "version": 0, "createdBy": "autotest-ref", - "createTime": "@var:NopSysCodeRule@updateTime", + "createTime": "@var:NopSysExtField@updateTime", "updatedBy": "autotest-ref", - "updateTime": "@var:NopSysCodeRule@updateTime", - "id": "@var:NopSysExtField@entityId", + "updateTime": "@var:NopSysExtField@updateTime", "seqName": null, "remark": null, "extFldC": "xyz" diff --git a/nop-sys/nop-sys-service/src/test/resources/_vfs/_delta/default/nop/sys/model/NopSysCodeRule/NopSysCodeRule.xmeta b/nop-sys/nop-sys-service/src/test/resources/_vfs/_delta/default/nop/sys/model/NopSysCodeRule/NopSysCodeRule.xmeta index a5aaeb232..8d822adad 100644 --- a/nop-sys/nop-sys-service/src/test/resources/_vfs/_delta/default/nop/sys/model/NopSysCodeRule/NopSysCodeRule.xmeta +++ b/nop-sys/nop-sys-service/src/test/resources/_vfs/_delta/default/nop/sys/model/NopSysCodeRule/NopSysCodeRule.xmeta @@ -1,6 +1,6 @@ - + \ No newline at end of file