From 689de6c5e21a881164d458e82d6aeb46be32cd2f Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期一, 09 八月 2021 16:53:41 +0800
Subject: [PATCH] 添加自定义banner
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index d65b461..d928d87 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -276,7 +276,7 @@
resetOnlineServerItem(serverItemFromConfig);
setZLMConfig(serverItemFromConfig);
}else {
- String now = this.format.format(new Date(System.currentTimeMillis()));
+ String now = this.format.format(System.currentTimeMillis());
if (serverItem == null){
// 涓�涓柊鐨剒lm鎺ュ叆wvp
serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getSipIp());
@@ -342,12 +342,14 @@
if (redisUtil.zSize(key) == null || redisUtil.zSize(key) == 0) {
logger.info("鑾峰彇璐熻浇鏈�浣庣殑鑺傜偣鏃舵棤鍦ㄧ嚎鑺傜偣");
+ return null;
}
// 鑾峰彇鍒嗘暟鏈�浣庣殑锛屽強骞跺彂鏈�浣庣殑
Set<Object> objects = redisUtil.ZRange(key, 0, -1);
- ArrayList<Object> MediaServerObjectS = new ArrayList<>(objects);
- String mediaServerId = (String)MediaServerObjectS.get(0);
+ ArrayList<Object> mediaServerObjectS = new ArrayList<>(objects);
+
+ String mediaServerId = (String)mediaServerObjectS.get(0);
return getOne(mediaServerId);
}
--
Gitblit v1.8.0