From 4d975c21da2d10233d82d6047e72b0d82b7da343 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期二, 19 四月 2022 11:52:03 +0800
Subject: [PATCH] 优化国标级联目录推送，支持zlm新特性ssrc校验
---
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
index 650dbe0..c147a9d 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.vmanager.log;
-import com.genersoft.iot.vmp.conf.UserSetup;
-import com.genersoft.iot.vmp.media.zlm.ZLMRunner;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.service.ILogService;
import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
@@ -33,7 +32,7 @@
private ILogService logService;
@Autowired
- private UserSetup userSetup;
+ private UserSetting userSetting;
private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -69,7 +68,7 @@
if (StringUtils.isEmpty(query)) query = null;
if (StringUtils.isEmpty(startTime)) startTime = null;
if (StringUtils.isEmpty(endTime)) endTime = null;
- if (!userSetup.getLogInDatebase()) {
+ if (!userSetting.getLogInDatebase()) {
logger.warn("鑷姩璁板綍鏃ュ織鍔熻兘宸插叧闂紝鏌ヨ缁撴灉鍙兘涓嶅畬鏁淬��");
}
--
Gitblit v1.8.0