From 6246ce6ba84fd2b4e7ce7768bfa1fb56c159cad3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 二月 2023 16:24:02 +0800
Subject: [PATCH] Merge pull request #736 from kunlong-luo/fix-null-point-and-cast-exception

---
 src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java
index b73acb9..6133694 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java
@@ -21,8 +21,15 @@
     @Autowired
     private DataSource dataSource;
 
+    @Autowired
+    private UserSetting userSetting;
+
     @PostConstruct
     public void migrate() {
+        if (!userSetting.getSyncDb()) {
+            logger.info("[鏁版嵁搴撹嚜鍔ㄥ崌绾 宸插叧闂�");
+            return;
+        }
         Flyway flyway = Flyway.configure()
                 .dataSource(dataSource)
                 .locations("db/migration")//sql鏂囦欢鍚嶇О瑙勫垯锛�"V20210625.17.30__V1.0.sql"

--
Gitblit v1.8.0