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