diff --git a/epmet-commons/epmet-commons-mybatis/pom.xml b/epmet-commons/epmet-commons-mybatis/pom.xml
index 171b56af2f..502ef21e81 100644
--- a/epmet-commons/epmet-commons-mybatis/pom.xml
+++ b/epmet-commons/epmet-commons-mybatis/pom.xml
@@ -70,6 +70,12 @@
pagehelper-spring-boot-starter
1.2.12
+
+
+
+ org.flywaydb
+ flyway-core
+
diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml
index 53aec4fb80..bf5ac60a2c 100644
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@@ -110,13 +110,13 @@
-
+
- epmet_gov_access_user
- EpmEt-db-UsEr
+ root
+ root
0
- 192.168.1.130
+ localhost
6379
123456
@@ -127,6 +127,9 @@
false
+
+
+ false
@@ -157,6 +160,9 @@
false
+
+
+ true
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java
index f4781aa923..469de9dc52 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/GovAccessApplication.java
@@ -6,15 +6,15 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
/**
- *
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
+//@EnableConfigurationProperties(value = {DatabaseProperties.class})
public class GovAccessApplication {
- public static void main(String[] args) {
- SpringApplication.run(GovAccessApplication.class, args);
- }
+ public static void main(String[] args) {
+ SpringApplication.run(GovAccessApplication.class, args);
+ }
}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DatabaseProperties.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DatabaseProperties.java
new file mode 100644
index 0000000000..e9282216d8
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DatabaseProperties.java
@@ -0,0 +1,15 @@
+//package com.epmet.config;
+//
+//import lombok.Data;
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//
+//@ConfigurationProperties(prefix = "spring.datasource.druid")
+//@Data
+//public class DatabaseProperties {
+//
+// private String driverClassName;
+// private String url;
+// private String username;
+// private String password;
+//
+//}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DbMigrationConfig.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DbMigrationConfig.java
new file mode 100644
index 0000000000..b9fcdfb160
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/DbMigrationConfig.java
@@ -0,0 +1,29 @@
+//package com.epmet.config;
+//
+//import org.flywaydb.core.Flyway;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+//import javax.annotation.PostConstruct;
+//
+///**
+// * 数据库迁移配置
+// */
+//@Configuration
+//public class DbMigrationConfig {
+//
+// @Autowired
+// private DatabaseProperties databaseProperties;
+//
+// @PostConstruct
+// public void migrate() {
+// Flyway flyway = Flyway.configure().dataSource(
+// databaseProperties.getUrl(),
+// databaseProperties.getUsername(),
+// databaseProperties.getPassword())
+// .baselineOnMigrate(true)
+// .load();
+//
+// flyway.migrate();
+// }
+//
+//}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
index cf118b769a..f1159f2892 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
@@ -50,6 +50,17 @@ spring:
# - data-id: common.yaml
# group: ${spring.cloud.nacos.config.group}
# refresh: true
+
+ # 数据迁移工具flyway
+ flyway:
+ enabled: @spring.flyway.enabled@
+ locations: classpath:db/migration
+ url: @spring.datasource.druid.url@
+ user: @spring.datasource.druid.username@
+ password: @spring.datasource.druid.password@
+ baseline-on-migrate: true
+
+
management:
endpoints:
web:
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql
new file mode 100644
index 0000000000..ecd68455d3
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql
@@ -0,0 +1,4 @@
+-- CREATE TABLE epmet_gov_access.device_t (
+-- device_id bigint(11) primary KEY auto_increment,
+-- device_name varchar(20) NOT NULL
+-- )
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/epmet_gov_access.sql
similarity index 100%
rename from epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql
rename to epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/epmet_gov_access.sql