去除flyway配置

648540858
1 parent f89ef3ab
Showing 3 changed files with 2 additions and 15 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
src/main/resources/application.yml
@@ -176,6 +176,7 @@ public class PlatformServiceImpl implements IPlatformService {
             // 保存时启用就发送注册
             // 注册成功时由程序直接调用了online方法
             try {
+                logger.info("[国标级联] 平台注册 {}", parentPlatform.getDeviceGBId());
                 commanderForPlatform.register(parentPlatform, eventResult -> {
                     logger.info("[国标级联] {},添加向上级注册失败，请确定上级平台可用时重新保存", parentPlatform.getServerGBId());
                 }, null);
@@ -441,9 +441,6 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
 	 */
 	@Override
 	public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
-		if (mobilePosition.getDeviceId().equals(mobilePosition.getChannelId())) {
-			mobilePosition.setChannelId(null);
-		}
 		return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
 	}
  
@@ -2,15 +2,4 @@ spring:
   application:
     name: wvp
   profiles:
-    active: local
-  # flayway相关配置
-  flyway:
-    enabled: true   #是否启用flyway(默认true)
-    locations: classpath:db/migration   #这个路径指的是fly版本控制的sql语句存放的路径,可以多个，可以给每个环境使用不同位置,比如classpath:db/migration,classpath:test/db/migration
-    baseline-on-migrate: true   #开启自动创建flyway元数据表标识 默认: false
-    # 与 baseline-on-migrate: true 搭配使用,将当前数据库初始版本设置为0
-    baseline-version: 0
-    clean-disabled: true    #禁止flyway执行清理
-    # 假如已经执行了版本1和版本3，如果增加了一个版本2，下面这个选项将会允许执行版本2的脚本
-    out-of-order: true
-    table: flyway_schema_history_${spring.application.name}  #用于记录所有的版本变化记录
 \ No newline at end of file
+    active: local
 \ No newline at end of file