From 11e8fad2e981b3dca22dad4048246d012ce326b7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 22 六月 2021 13:13:31 +0800
Subject: [PATCH] Merge pull request #113 from lawrencehj/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/onvif/ONVIFController.java | 1
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 1
src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java | 2 -
src/main/java/com/genersoft/iot/vmp/service/impl/RecordInfoServerImpl.java | 1
src/main/java/com/genersoft/iot/vmp/storager/dao/RecordInfoDao.java | 1
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/SseController/SseController.java | 4 +-
web_src/src/components/Login.vue | 2
web_src/src/main.js | 2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerManger.java | 1
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java | 1
src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java | 1
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java | 4 --
src/main/resources/application-dev.yml | 26 +++++++------
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java | 1
src/main/java/com/genersoft/iot/vmp/service/IMediaService.java | 1
src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java | 4 --
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 21 +++++++---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java | 1
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java | 1
web_src/src/components/ParentPlatformList.vue | 2
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java | 1
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 1
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 1
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java | 2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 2 -
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java | 4 --
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java | 16 +++-----
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 2 -
30 files changed, 44 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
index 2d92658..f8b95fc 100644
--- a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
+++ b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
@@ -3,7 +3,6 @@
import java.util.logging.LogManager;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;
import springfox.documentation.oas.annotations.EnableOpenApi;
diff --git a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
index 5eab234..6d8f45d 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
@@ -16,7 +16,7 @@
public static final String CACHEKEY_PREFIX = "VMP_channel_";
- public static final String KEEPLIVEKEY_PREFIX = "VMP_KEEPLIVE_";
+ public static final String KEEPLIVEKEY_PREFIX = "VMP_keeplive_";
public static final String PLAYER_PREFIX = "VMP_player_";
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
index 48f1af5..3158025 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.conf;
-import io.netty.util.internal.StringUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils;
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
index 06d62df..3c4ea17 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -2,8 +2,7 @@
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.catalina.connector.ClientAbortException;
import org.mitre.dsmiley.httpproxy.ProxyServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,16 +13,11 @@
import org.springframework.util.StringUtils;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.ConnectException;
-import java.util.Locale;
-import java.util.Map;
-
+@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
public class ProxyServletConfig {
@@ -61,7 +55,7 @@
@Override
protected void handleRequestException(HttpRequest proxyRequest, HttpResponse proxyResonse, Exception e){
- System.out.println(e.getMessage());
+ //System.out.println(e.getMessage());
try {
super.handleRequestException(proxyRequest, proxyResonse, e);
} catch (ServletException servletException) {
@@ -69,7 +63,9 @@
} catch (IOException ioException) {
if (ioException instanceof ConnectException) {
logger.error("zlm 杩炴帴澶辫触");
- }else {
+ } else if (ioException instanceof ClientAbortException) {
+ logger.error("鐢ㄦ埛宸蹭腑鏂繛鎺ワ紝浠ｇ悊缁堟");
+ } else {
logger.error("zlm 浠ｇ悊澶辫触锛� ", e);
}
} catch (RuntimeException exception){
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java b/src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java
index 62eecc6..2b7ab1a 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java
@@ -1,8 +1,5 @@
package com.genersoft.iot.vmp.conf;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +7,6 @@
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-import java.util.List;
/**
* 绯荤粺鍚姩鏃舵帶鍒惰澶囩绾�
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
index 40d588f..fd7383b 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
@@ -2,7 +2,6 @@
import com.genersoft.iot.vmp.conf.UserSetup;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java
index 6a1401d..7377997 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java
@@ -5,7 +5,6 @@
import java.util.Random;
import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
index 795d0eb..182799c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
-import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
@@ -12,7 +11,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.DependsOn;
import org.springframework.context.annotation.Lazy;
import org.springframework.lang.Nullable;
@@ -23,8 +21,6 @@
import javax.sip.header.WWWAuthenticateHeader;
import javax.sip.message.Request;
import java.text.ParseException;
-import java.util.Timer;
-import java.util.TimerTask;
import java.util.UUID;
@Component
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
index 37cf1cd..0c8d6c0 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
@@ -2,10 +2,7 @@
import java.security.NoSuchAlgorithmException;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
import java.util.Calendar;
-import java.util.Date;
import java.util.Locale;
import javax.sip.InvalidArgumentException;
@@ -22,7 +19,6 @@
import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
import gov.nist.javax.sip.RequestEventExt;
import gov.nist.javax.sip.header.SIPDateHeader;
-import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java
index ba3003d..f8a59bb 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java
@@ -5,7 +5,6 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
-import com.genersoft.iot.vmp.gb28181.transmit.request.impl.RegisterRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 731722f..bd8485d 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -15,10 +15,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index 63102b1..ab1d2dd 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -8,7 +8,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.HashMap;
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
index 5196f4c..21fcebf 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.media.zlm;
import com.alibaba.fastjson.annotation.JSONField;
-import org.springframework.util.StringUtils;
public class ZLMServerConfig {
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerManger.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerManger.java
index 3770d80..fde3b44 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerManger.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerManger.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.media.zlm;
-import com.alibaba.fastjson.annotation.JSONField;
import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java b/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
index 89bcecd..afeee1c 100644
--- a/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
@@ -12,8 +12,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
index 3bb0f9e..f31e630 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.service;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
/**
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index ec0222b..320cc26 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -24,7 +24,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -32,13 +31,11 @@
import org.springframework.web.context.request.async.DeferredResult;
import javax.sip.ClientTransaction;
-import javax.sip.Dialog;
-import javax.sip.header.CallIdHeader;
import javax.sip.message.Response;
-import java.io.File;
import java.io.FileNotFoundException;
import java.util.UUID;
+@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Service
public class PlayServiceImpl implements IPlayService {
@@ -97,7 +94,20 @@
result.onCompletion(()->{
// 鐐规挱缁撴潫鏃惰皟鐢ㄦ埅鍥炬帴鍙�
try {
- String path = ResourceUtils.getURL("classpath:").getPath()+"static/static/snap/";
+ String classPath = ResourceUtils.getURL("classpath:").getPath();
+ // System.out.println(classPath);
+ String path = classPath + "static/static/snap/";
+ if(classPath.contains("jar")) {
+ classPath = classPath.substring(0, classPath.lastIndexOf("."));
+ classPath = classPath.substring(0, classPath.lastIndexOf("/"));
+ path = classPath + "/snap/";
+ }
+ if (path.startsWith("file:")) {
+ path = path.substring(path.indexOf(":") + 1, path.length());
+ }
+ if(System.getProperty("os.name").contains("indows")) {
+ path = path.substring(1, path.length());
+ }
String fileName = deviceId + "_" + channelId + ".jpg";
ResponseEntity responseEntity = (ResponseEntity)result.getResult();
if (responseEntity != null && responseEntity.getStatusCode() == HttpStatus.OK) {
@@ -109,7 +119,6 @@
zlmresTfulUtils.getSnap(flvUrl, 5, 1, path, fileName);
}
}
-
System.out.println(path);
} catch (FileNotFoundException e) {
e.printStackTrace();
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/RecordInfoServerImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/RecordInfoServerImpl.java
index b2da28e..4908363 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/RecordInfoServerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/RecordInfoServerImpl.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.service.impl;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.service.IRecordInfoServer;
import com.genersoft.iot.vmp.storager.dao.RecordInfoDao;
import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo;
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/RecordInfoDao.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/RecordInfoDao.java
index c32cedc..2d73982 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/RecordInfoDao.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/RecordInfoDao.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo;
-import com.genersoft.iot.vmp.storager.dao.dto.User;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index 6600a75..bbe8c2b 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -3,7 +3,6 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/SseController/SseController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/SseController/SseController.java
index 3a10cb0..5f09828 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/SseController/SseController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/SseController/SseController.java
@@ -8,7 +8,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
@@ -30,7 +30,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "browserId", value = "娴忚鍣↖D", dataTypeClass = String.class),
})
- @PostMapping("/emit")
+ @GetMapping("/emit")
public SseEmitter emit(@RequestParam String browserId) {
final SseEmitter sseEmitter = new SseEmitter(0L);
try {
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
index 220d321..45059aa 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
@@ -120,7 +120,7 @@
* @param deviceId 璁惧ID
* @param guardCmdStr SetGuard锛氬竷闃诧紝ResetGuard锛氭挙闃�
*/
- @ApiOperation("褰曞儚鎺у埗鍛戒护")
+ @ApiOperation("甯冮槻/鎾ら槻鍛戒护")
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
@ApiImplicitParam(name = "guardCmdStr", value ="鍛戒护锛� 鍙�夊�硷細SetGuard锛堝竷闃诧級锛孯esetGuard锛堟挙闃诧級", required = true,
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 953f61d..0f35945 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -19,7 +19,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.util.ResourceUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -32,7 +31,6 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.springframework.web.context.request.async.DeferredResult;
-import java.io.FileNotFoundException;
import java.util.UUID;
import javax.sip.message.Response;
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/onvif/ONVIFController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/onvif/ONVIFController.java
index a484b51..67bdb97 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/onvif/ONVIFController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/onvif/ONVIFController.java
@@ -17,6 +17,7 @@
import java.util.List;
import java.util.UUID;
+@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Api(tags = "onvif璁惧")
@CrossOrigin
@RestController
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index 6c8ba2b..bbd4bd5 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -3,7 +3,6 @@
import com.genersoft.iot.vmp.VManageBootstrap;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.impl.RedisCatchStorageImpl;
import com.genersoft.iot.vmp.utils.SpringBeanFactory;
import gov.nist.javax.sip.SipStackImpl;
import io.swagger.annotations.Api;
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
index fd53cea..51c8c8e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
@@ -16,6 +16,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+@SuppressWarnings("rawtypes")
/**
* 鎷夋祦浠ｇ悊鎺ュ彛
*/
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 96f7f6a..3ebe94d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,6 +15,8 @@
datasource:
name: eiot
url: jdbc:sqlite::resource:wvp.sqlite
+ # 鎵撳寘涓簀ar杩愯鏃舵妸wvp.sqlite鍙戝埌jar鍚岀骇鏂囦欢澶癸紝鍚屾椂url鏀逛负锛�
+ # url: jdbc:sqlite:wvp.sqlite
username:
password:
type: com.alibaba.druid.pool.DruidDataSource
@@ -59,6 +61,18 @@
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
recordAssistPort: 0
+
+# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
+logging:
+ file:
+ name: logs/wvp.log
+ max-history: 30
+ max-size: 10MB
+ total-size-cap: 300MB
+ level:
+ com:
+ genersoft:
+ iot: info
# [鏍规嵁涓氬姟闇�姹傞厤缃甝
userSettings:
# [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true
@@ -73,15 +87,3 @@
documentation:
swagger-ui:
enabled: true
-
-# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
-logging:
- file:
- name: logs/wvp.log
- max-history: 30
- max-size: 10MB
- total-size-cap: 300MB
- level:
- com:
- genersoft:
- iot: info
\ No newline at end of file
diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue
index 7aff1ae..fa90fe1 100644
--- a/web_src/src/components/Login.vue
+++ b/web_src/src/components/Login.vue
@@ -80,7 +80,7 @@
this.$axios({
method: 'get',
- url:"/api/user/login",
+ url:"/api/user/login",
params: loginParam
}).then(function (res) {
console.log(JSON.stringify(res));
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index ecc174a..6960c6a 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -156,7 +156,7 @@
this.$axios({
method: 'get',
- url:`/api/platform/query/${that.count}/${that.currentPage}`
+ url:`/api/platform/query/${that.count}/${that.currentPage}`
}).then(function (res) {
that.total = res.data.total;
that.platformList = res.data.list;
diff --git a/web_src/src/main.js b/web_src/src/main.js
index 472a5f6..ffd7fde 100644
--- a/web_src/src/main.js
+++ b/web_src/src/main.js
@@ -47,7 +47,7 @@
}, function (error) {
// 瀵瑰搷搴旈敊璇仛鐐逛粈涔�
if (error.response.status === 401) {
- console.log((1111))
+ console.log("Received 401 Response")
router.push('/login');
}
return Promise.reject(error);
--
Gitblit v1.8.0