diff --git a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/DeStandaloneVersion.java b/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/DeStandaloneVersion.java index 0f0e95e4c8..88f68411f4 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/DeStandaloneVersion.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/dao/auto/entity/DeStandaloneVersion.java @@ -49,7 +49,6 @@ public class DeStandaloneVersion { private String installedBy; @NotNull - @ColumnDefault("CURRENT_TIMESTAMP") @Column(name = "installed_on", nullable = false) private Instant installedOn; diff --git a/core/core-backend/src/main/resources/application-desktop.yml b/core/core-backend/src/main/resources/application-desktop.yml index b6bb17e601..7c9932c24a 100644 --- a/core/core-backend/src/main/resources/application-desktop.yml +++ b/core/core-backend/src/main/resources/application-desktop.yml @@ -14,7 +14,7 @@ spring: messages: basename: i18n/core flyway: - enabled: false + enabled: true table: de_desktop_version validate-on-migrate: false locations: classpath:db/desktop diff --git a/core/core-backend/src/main/resources/application-standalone.yml b/core/core-backend/src/main/resources/application-standalone.yml index 61050d7ab3..b0a229fa23 100644 --- a/core/core-backend/src/main/resources/application-standalone.yml +++ b/core/core-backend/src/main/resources/application-standalone.yml @@ -5,10 +5,13 @@ spring: password: 123456 messages: basename: i18n/lic,i18n/core,i18n/permissions,i18n/xpack,i18n/sync - flyway: - enabled: false - + enabled: true + table: de_standalone_version + validate-on-migrate: false + locations: classpath:db/migration + baseline-on-migrate: true + out-of-order: true jpa: properties: hibernate: diff --git a/de-xpack b/de-xpack index 7f87d14ad7..24eac7ffc6 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 7f87d14ad77a85266eaddad5890c4780aa885db7 +Subproject commit 24eac7ffc6d625195291b2b98a8efbed3fdbbae5 diff --git a/sdk/common/pom.xml b/sdk/common/pom.xml index 92d6c9f8dd..eb2857fe55 100644 --- a/sdk/common/pom.xml +++ b/sdk/common/pom.xml @@ -28,7 +28,10 @@ org.springframework.boot spring-boot-starter-validation - + + org.springframework.boot + spring-boot-starter-data-jpa + org.apache.commons commons-lang3