From aa3cec0dfce9a980bfc518172700b5a82ef02ca8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 06 二月 2023 10:46:23 +0800
Subject: [PATCH] 去除数据库自动更新,自动更新会导致wvp在arm架构服务上无法启动

---
 /dev/null                                                               |   64 --------------------------------
 src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java               |    9 ----
 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java |    9 ++--
 pom.xml                                                                 |    7 ---
 4 files changed, 6 insertions(+), 83 deletions(-)

diff --git a/pom.xml b/pom.xml
index 510f528..2943343 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,13 +242,8 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 <!--			<scope>test</scope>-->
 		</dependency>
-		<dependency>
-			<groupId>org.flywaydb</groupId>
-			<artifactId>flyway-core</artifactId>
-			<version>7.15.0</version>
-		</dependency>
-	</dependencies>
 
+	</dependencies>
 
 
 	<build>
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java
deleted file mode 100644
index 6133694..0000000
--- a/src/main/java/com/genersoft/iot/vmp/conf/FlywayConfig.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.genersoft.iot.vmp.conf;
-
-import org.flywaydb.core.Flyway;
-import org.flywaydb.core.api.FlywayException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.PostConstruct;
-import javax.sql.DataSource;
-
-/**
- * 鏁版嵁搴撹嚜鍔ㄥ崌绾ц剼鏈�
- */
-@Configuration
-public class FlywayConfig {
-
-    private final static Logger logger = LoggerFactory.getLogger(FlywayConfig.class);
-
-    @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"
-                // 鑷姩鍒涘缓flyway鍏冩暟鎹〃鏍囪瘑
-                .baselineOnMigrate(true)
-                .baselineVersion("0")
-                // 绂佹flyway鎵ц娓呯悊
-                .cleanDisabled(true)
-                .table("flyway_schema_history_wvp")
-                // 瀵逛簬寮�鍙戠幆澧�, 鍙兘鏄浜哄崗浣滃紑鍙�, 寰堝彲鑳藉厛 apply 浜嗚嚜宸辨湰鍦扮殑鏈�鏂� SQL 浠g爜, 鐒跺悗鍙戠幇鍏朵粬鍚屼簨鏃╁厛鏃跺�欐彁浜ょ殑 SQL 浠g爜杩樻病鏈� apply,
-                // 鎵�浠� 寮�鍙戠幆澧冨簲璇ヨ缃� spring.flyway.outOfOrder=true, 杩欐牱 flyway 灏嗚兘鍔犺浇婕忔帀鐨勮�佺増鏈� SQL 鏂囦欢;
-                // 鑰岀敓浜х幆澧冨簲璇ヨ缃� spring.flyway.outOfOrder=false
-                .outOfOrder(true)
-                .encoding("UTF-8")
-                .load();
-        try {
-            flyway.migrate();
-        } catch (FlywayException e) {
-            logger.error("[鏁版嵁搴撹嚜鍔ㄥ崌绾閰嶇疆绗竴娆″姞杞藉嚭閿�", e);
-            try {
-                flyway.repair();//鐢熸垚鐗堟湰璁板綍琛�
-                logger.info("[鏁版嵁搴撹嚜鍔ㄥ崌绾閰嶇疆淇鎴愬姛");
-                flyway.migrate();
-                logger.info("[鏁版嵁搴撹嚜鍔ㄥ崌绾閰嶇疆閲嶆柊鍔犺浇鎴愬姛");
-            } catch (Exception e1) {
-                logger.error("[鏁版嵁搴撹嚜鍔ㄥ崌绾閰嶇疆绗簩娆″姞杞藉嚭閿�", e1);
-                throw e1;
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
index be7d5af..a0956cc 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
@@ -46,7 +46,6 @@
     private Boolean syncChannelOnDeviceOnline = Boolean.FALSE;
 
     private Boolean sipLog = Boolean.FALSE;
-    private Boolean syncDb = Boolean.TRUE;
 
     private String serverId = "000000";
 
@@ -216,13 +215,5 @@
 
     public void setSipLog(Boolean sipLog) {
         this.sipLog = sipLog;
-    }
-
-    public Boolean getSyncDb() {
-        return syncDb;
-    }
-
-    public void setSyncDb(Boolean syncDb) {
-        this.syncDb = syncDb;
     }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java
index f67e152..f927d51 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java
@@ -1,9 +1,10 @@
 package com.genersoft.iot.vmp.storager.dao;
 
 import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -20,7 +21,7 @@
     int add(DeviceAlarm alarm);
 
 
-    @Select(value = {" <script>" +
+    @Select( value = {" <script>" +
             " SELECT * FROM device_alarm " +
             " WHERE 1=1 " +
             " <if test=\"deviceId != null\" >  AND deviceId = #{deviceId}</if>" +

--
Gitblit v1.8.0