From dd32f4b07a97d784544bcd2a8c698bdecb232bf0 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 22 Apr 2025 09:52:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0sip=E4=BF=A1=E4=BB=A4?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 6be84b0a9..5822d64c5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -27,12 +27,12 @@ public class SipConfig {
 	private String id;
 
 	private String password;
-	
+
 	Integer ptzSpeed = 50;
 
 	Integer registerTimeInterval = 120;
 
 	private boolean alarm = false;
 
-	private long timeout = 500;
+	private long timeout = 1000;
 }

From a433003f74bca9ec74a5033c6fc7319940021e23 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 22 Apr 2025 11:24:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
index 2e5b8e234..71c4b0b0a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
@@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.gb28181.service.impl;
 
 import com.genersoft.iot.vmp.common.InviteSessionType;
 import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.conf.exception.ServiceException;
 import com.genersoft.iot.vmp.gb28181.bean.*;
 import com.genersoft.iot.vmp.common.enums.ChannelDataType;
@@ -145,6 +146,9 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService {
             deviceChannelPlayService.play(channel, record, callback);
         } catch (PlayException e) {
             callback.run(e.getCode(), e.getMsg(), null);
+        } catch (ControllerException e) {
+            log.error("[点播失败] {}({}), {}", channel.getGbName(), channel.getGbDeviceId(), e.getMsg());
+            callback.run(Response.BUSY_HERE, "busy here", null);
         } catch (Exception e) {
             log.error("[点播失败] {}({})", channel.getGbName(), channel.getGbDeviceId(), e);
             callback.run(Response.BUSY_HERE, "busy here", null);

From 13b7edb27161f9a54f55182a79a036809679ddc2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 23 Apr 2025 22:19:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 19d3e8396..a53cd8947 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,6 @@
             <version>1.4.6</version>
         </dependency>
 
-        <!--在线文档 -->
         <!--在线文档 -->
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -200,13 +199,6 @@
             <version>1.6.10</version>
         </dependency>
 
-		<!--在线文档 -->
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
-			<version>1.6.10</version>
-		</dependency>
-
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-springdoc-ui</artifactId>