Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
结构优化
648540858 2023-12-14 09:30:21 +08:00
commit 60dffa5813
23 changed files with 801 additions and 682 deletions

58
pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.9</version> <version>2.7.17</version>
</parent> </parent>
<groupId>com.genersoft</groupId> <groupId>com.genersoft</groupId>
@ -30,6 +30,7 @@
</releases> </releases>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>nexus-aliyun</id> <id>nexus-aliyun</id>
@ -130,9 +131,9 @@
<!-- mysql数据库 --> <!-- mysql数据库 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>com.mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>8.0.30</version> <version>8.2.0</version>
</dependency> </dependency>
<!--postgresql--> <!--postgresql-->
@ -144,8 +145,8 @@
<!-- kingbase人大金仓 --> <!-- kingbase人大金仓 -->
<!-- 手动下载驱动后安装 --> <!-- 手动下载驱动后安装 -->
<!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8
--> -Dversion=8.6.0 -Dpackaging=jar -->
<dependency> <dependency>
<groupId>com.kingbase</groupId> <groupId>com.kingbase</groupId>
<artifactId>kingbase8</artifactId> <artifactId>kingbase8</artifactId>
@ -165,7 +166,18 @@
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId> <artifactId>springdoc-openapi-ui</artifactId>
<version>1.6.10</version> <version>1.7.0</version>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
@ -207,12 +219,6 @@
<version>2.1.3</version> <version>2.1.3</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
</dependency>
<!-- json解析库fastjson2 --> <!-- json解析库fastjson2 -->
<dependency> <dependency>
<groupId>com.alibaba.fastjson2</groupId> <groupId>com.alibaba.fastjson2</groupId>
@ -271,7 +277,18 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId> <artifactId>easyexcel</artifactId>
<version>3.1.1</version> <version>3.3.2</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.24.0</version>
</dependency> </dependency>
<!-- 获取系统信息 --> <!-- 获取系统信息 -->
@ -286,8 +303,8 @@
<artifactId>spring-session-core</artifactId> <artifactId>spring-session-core</artifactId>
</dependency> </dependency>
<!-- &lt;!&ndash; 检测文件编码 &ndash;&gt;--> <!-- 检测文件编码 -->
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/cpdetector/cpdetector &ndash;&gt;--> <!-- https://mvnrepository.com/artifact/cpdetector/cpdetector -->
<!--<dependency>--> <!--<dependency>-->
<!-- <groupId>cpdetector</groupId>--> <!-- <groupId>cpdetector</groupId>-->
<!-- <artifactId>cpdetector</artifactId>--> <!-- <artifactId>cpdetector</artifactId>-->
@ -298,19 +315,16 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>31.1-jre</version> <version>32.1.3-jre</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<!-- <scope>test</scope>--> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName> <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
<plugins> <plugins>
@ -322,6 +336,7 @@
<includeSystemScope>true</includeSystemScope> <includeSystemScope>true</includeSystemScope>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -342,6 +357,7 @@
<dateFormat>yyyyMMdd</dateFormat> <dateFormat>yyyyMMdd</dateFormat>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>

View File

@ -78,6 +78,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
// 构建UsernamePasswordAuthenticationToken,这里密码为null是因为提供了正确的JWT,实现自动登录 // 构建UsernamePasswordAuthenticationToken,这里密码为null是因为提供了正确的JWT,实现自动登录
User user = new User(); User user = new User();
user.setId(jwtUser.getUserId());
user.setUsername(jwtUser.getUserName()); user.setUsername(jwtUser.getUserName());
user.setPassword(jwtUser.getPassword()); user.setPassword(jwtUser.getPassword());
Role role = new Role(); Role role = new Role();

View File

@ -144,6 +144,7 @@ public class JwtUtils implements InitializingBean {
jwtUser.setUserName(username); jwtUser.setUserName(username);
jwtUser.setPassword(user.getPassword()); jwtUser.setPassword(user.getPassword());
jwtUser.setRoleId(user.getRole().getId()); jwtUser.setRoleId(user.getRole().getId());
jwtUser.setUserId(user.getId());
return jwtUser; return jwtUser;
} catch (InvalidJwtException e) { } catch (InvalidJwtException e) {

View File

@ -1,12 +1,12 @@
package com.genersoft.iot.vmp.conf.security; package com.genersoft.iot.vmp.conf.security;
import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.conf.UserSetting;
import org.springframework.core.annotation.Order;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider; import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@ -28,6 +28,7 @@ import java.util.Arrays;
/** /**
* Spring Security * Spring Security
*
* @author lin * @author lin
*/ */
@Configuration @Configuration
@ -75,6 +76,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
matchers.add("/js/**"); matchers.add("/js/**");
matchers.add("/api/device/query/snap/**"); matchers.add("/api/device/query/snap/**");
matchers.add("/record_proxy/*/**"); matchers.add("/record_proxy/*/**");
matchers.add("/api/emit");
matchers.addAll(userSetting.getInterfaceAuthenticationExcludes()); matchers.addAll(userSetting.getInterfaceAuthenticationExcludes());
// 可以直接访问的静态数据 // 可以直接访问的静态数据
web.ignoring().antMatchers(matchers.toArray(new String[0])); web.ignoring().antMatchers(matchers.toArray(new String[0]));
@ -83,6 +85,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
/** /**
* *
*
* @param auth * @param auth
* @throws Exception * @throws Exception
*/ */
@ -111,7 +114,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.authorizeRequests() .authorizeRequests()
.requestMatchers(CorsUtils::isPreFlightRequest).permitAll() .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
.antMatchers(userSetting.getInterfaceAuthenticationExcludes().toArray(new String[0])).permitAll() .antMatchers(userSetting.getInterfaceAuthenticationExcludes().toArray(new String[0])).permitAll()
.antMatchers("/api/user/login","/index/hook/**","/zlm_Proxy/FhTuMYqB2HeCuNOb/record/t/1/2023-03-25/16:35:07-16:35:16-9353.mp4").permitAll() .antMatchers("/api/user/login", "/index/hook/**").permitAll()
.anyRequest().authenticated() .anyRequest().authenticated()
// 异常处理器 // 异常处理器
.and() .and()

View File

@ -21,6 +21,7 @@ public class JwtUser {
EXCEPTION EXCEPTION
} }
private int userId;
private String userName; private String userName;
private String password; private String password;
@ -29,6 +30,14 @@ public class JwtUser {
private TokenStatus status; private TokenStatus status;
public int getUserId() {
return userId;
}
public void setUserId(int userId) {
this.userId = userId;
}
public String getUserName() { public String getUserName() {
return userName; return userName;
} }

View File

@ -1,8 +1,8 @@
package com.genersoft.iot.vmp.gb28181.conf; package com.genersoft.iot.vmp.gb28181.conf;
import gov.nist.core.StackLogger; import gov.nist.core.StackLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.spi.LocationAwareLogger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Properties; import java.util.Properties;
@ -10,7 +10,39 @@ import java.util.Properties;
@Component @Component
public class StackLoggerImpl implements StackLogger { public class StackLoggerImpl implements StackLogger {
private final static Logger logger = LoggerFactory.getLogger(StackLoggerImpl.class); /**
* (Fully Qualified Class Name)
*/
private static final String FQCN = StackLoggerImpl.class.getName();
/**
* (便())
* @return LocationAwareLogger
*/
private static LocationAwareLogger getLocationAwareLogger() {
return (LocationAwareLogger) LoggerFactory.getLogger(new Throwable().getStackTrace()[4].getClassName());
}
/**
*
* @param level
* @param message
*/
private static void log(int level, String message) {
LocationAwareLogger locationAwareLogger = getLocationAwareLogger();
locationAwareLogger.log(null, FQCN, level, message, null, null);
}
/**
*
* @param level
* @param message
*/
private static void log(int level, String message, Throwable throwable) {
LocationAwareLogger locationAwareLogger = getLocationAwareLogger();
locationAwareLogger.log(null, FQCN, level, message, null, throwable);
}
@Override @Override
public void logStackTrace() { public void logStackTrace() {
@ -34,27 +66,27 @@ public class StackLoggerImpl implements StackLogger {
@Override @Override
public void logDebug(String message) { public void logDebug(String message) {
// logger.debug(message); log(LocationAwareLogger.INFO_INT, message);
} }
@Override @Override
public void logDebug(String message, Exception ex) { public void logDebug(String message, Exception ex) {
// logger.debug(message); log(LocationAwareLogger.INFO_INT, message, ex);
} }
@Override @Override
public void logTrace(String message) { public void logTrace(String message) {
logger.trace(message); log(LocationAwareLogger.INFO_INT, message);
} }
@Override @Override
public void logFatalError(String message) { public void logFatalError(String message) {
// logger.error(message); log(LocationAwareLogger.INFO_INT, message);
} }
@Override @Override
public void logError(String message) { public void logError(String message) {
// logger.error(message); log(LocationAwareLogger.INFO_INT, message);
} }
@Override @Override
@ -69,17 +101,17 @@ public class StackLoggerImpl implements StackLogger {
@Override @Override
public void logError(String message, Exception ex) { public void logError(String message, Exception ex) {
// logger.error(message); log(LocationAwareLogger.INFO_INT, message, ex);
} }
@Override @Override
public void logWarning(String message) { public void logWarning(String message) {
logger.warn(message); log(LocationAwareLogger.INFO_INT, message);
} }
@Override @Override
public void logInfo(String message) { public void logInfo(String message) {
logger.info(message); log(LocationAwareLogger.INFO_INT, message);
} }
@Override @Override

View File

@ -1,55 +1,68 @@
package com.genersoft.iot.vmp.gb28181.event.alarm; package com.genersoft.iot.vmp.gb28181.event.alarm;
import org.springframework.context.ApplicationListener; import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import java.io.IOException;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
import java.io.PrintWriter;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/** /**
* @description: * .
* @author: lawrencehj *
* @data: 2021-01-20 * @author lawrencehj
* @author <a href="mailto:xiaoQQya@126.com">xiaoQQya</a>
* @since 2021/01/20
*/ */
@Component @Component
public class AlarmEventListener implements ApplicationListener<AlarmEvent> { public class AlarmEventListener implements ApplicationListener<AlarmEvent> {
private final static Logger logger = LoggerFactory.getLogger(AlarmEventListener.class); private static final Logger logger = LoggerFactory.getLogger(AlarmEventListener.class);
private static Map<String, SseEmitter> sseEmitters = new Hashtable<>(); private static final Map<String, PrintWriter> SSE_CACHE = new ConcurrentHashMap<>();
public void addSseEmitters(String browserId, SseEmitter sseEmitter) { public void addSseEmitter(String browserId, PrintWriter writer) {
sseEmitters.put(browserId, sseEmitter); SSE_CACHE.put(browserId, writer);
logger.info("SSE 在线数量: {}", SSE_CACHE.size());
}
public void removeSseEmitter(String browserId, PrintWriter writer) {
SSE_CACHE.remove(browserId, writer);
logger.info("SSE 在线数量: {}", SSE_CACHE.size());
} }
@Override @Override
public void onApplicationEvent(AlarmEvent event) { public void onApplicationEvent(@NotNull AlarmEvent event) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("设备报警事件触发deviceId" + event.getAlarmInfo().getDeviceId() + ", " logger.debug("设备报警事件触发, deviceId: {}, {}", event.getAlarmInfo().getDeviceId(), event.getAlarmInfo().getAlarmDescription());
+ event.getAlarmInfo().getAlarmDescription());
} }
String msg = "<strong>设备编码:</strong> <i>" + event.getAlarmInfo().getDeviceId() + "</i>"
+ "<br><strong>报警描述:</strong> <i>" + event.getAlarmInfo().getAlarmDescription() + "</i>"
+ "<br><strong>报警时间:</strong> <i>" + event.getAlarmInfo().getAlarmTime() + "</i>"
+ "<br><strong>报警位置:</strong> <i>" + event.getAlarmInfo().getLongitude() + "</i>"
+ ", <i>" + event.getAlarmInfo().getLatitude() + "</i>";
for (Iterator<Map.Entry<String, SseEmitter>> it = sseEmitters.entrySet().iterator(); it.hasNext();) { String msg = "<strong>设备编号:</strong> <i>" + event.getAlarmInfo().getDeviceId() + "</i>"
Map.Entry<String, SseEmitter> emitter = it.next(); + "<br><strong>通道编号:</strong> <i>" + event.getAlarmInfo().getChannelId() + "</i>"
logger.info("推送到SSE连接浏览器ID: " + emitter.getKey()); + "<br><strong>报警描述:</strong> <i>" + event.getAlarmInfo().getAlarmDescription() + "</i>"
+ "<br><strong>报警时间:</strong> <i>" + event.getAlarmInfo().getAlarmTime() + "</i>";
for (Iterator<Map.Entry<String, PrintWriter>> it = SSE_CACHE.entrySet().iterator(); it.hasNext(); ) {
Map.Entry<String, PrintWriter> response = it.next();
logger.info("推送到 SSE 连接, 浏览器 ID: {}", response.getKey());
try { try {
emitter.getValue().send(msg); PrintWriter writer = response.getValue();
} catch (IOException | IllegalStateException e) {
if (logger.isDebugEnabled()) { if (writer.checkError()) {
logger.debug("SSE连接已关闭"); it.remove();
continue;
} }
// 移除已关闭的连接
String sseMsg = "event:message\n" +
"data:" + msg + "\n" +
"\n";
writer.write(sseMsg);
writer.flush();
} catch (Exception e) {
it.remove(); it.remove();
} }
} }

View File

@ -374,7 +374,8 @@ public class SIPCommander implements ISIPCommander {
}), e -> { }), e -> {
ResponseEvent responseEvent = (ResponseEvent) e.event; ResponseEvent responseEvent = (ResponseEvent) e.event;
SIPResponse response = (SIPResponse) responseEvent.getResponse(); SIPResponse response = (SIPResponse) responseEvent.getResponse();
streamSession.put(device.getDeviceId(), channelId, "play", stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response, String callId = response.getCallIdHeader().getCallId();
streamSession.put(device.getDeviceId(), channelId, callId, stream, ssrcInfo.getSsrc(), mediaServerItem.getId(), response,
InviteSessionType.PLAY); InviteSessionType.PLAY);
okEvent.response(e); okEvent.response(e);
}); });

View File

@ -61,7 +61,7 @@ public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent imp
return; return;
} }
SIPRequest request = (SIPRequest) evt.getRequest(); SIPRequest request = (SIPRequest) evt.getRequest();
logger.info("[收到心跳] device: {}, callId: {}", device.getDeviceId(), request.getCallIdHeader().getCallId()); logger.info("[收到心跳] device: {}, callId: {}", device.getDeviceId(), request.getCallIdHeader().getCallId());
// 回复200 OK // 回复200 OK
try { try {
@ -80,6 +80,11 @@ public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent imp
device.setPort(remoteAddressInfo.getPort()); device.setPort(remoteAddressInfo.getPort());
device.setHostAddress(remoteAddressInfo.getIp().concat(":").concat(String.valueOf(remoteAddressInfo.getPort()))); device.setHostAddress(remoteAddressInfo.getIp().concat(":").concat(String.valueOf(remoteAddressInfo.getPort())));
device.setIp(remoteAddressInfo.getIp()); device.setIp(remoteAddressInfo.getIp());
// 设备地址变化会引起目录订阅任务失效,需要重新添加
if (device.getSubscribeCycleForCatalog() > 0) {
deviceService.removeCatalogSubscribe(device);
deviceService.addCatalogSubscribe(device);
}
} }
if (device.getKeepaliveTime() == null) { if (device.getKeepaliveTime() == null) {
device.setKeepaliveIntervalTime(60); device.setKeepaliveIntervalTime(60);

View File

@ -251,7 +251,6 @@ public class ZLMHttpHookListener {
HookResultForOnPublish result = HookResultForOnPublish.SUCCESS(); HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();
result.setEnable_audio(true);
taskExecutor.execute(() -> { taskExecutor.execute(() -> {
ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json); ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
if (subscribe != null) { if (subscribe != null) {
@ -269,22 +268,28 @@ public class ZLMHttpHookListener {
} else { } else {
result.setEnable_mp4(userSetting.isRecordPushLive()); result.setEnable_mp4(userSetting.isRecordPushLive());
} }
// 替换流地址
if ("rtp".equals(param.getApp()) && !mediaInfo.isRtpEnable()) { // 国标流
String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));; if ("rtp".equals(param.getApp()) ) {
InviteInfo inviteInfo = inviteStreamService.getInviteInfoBySSRC(ssrc);
if (inviteInfo != null) { InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());
// 单端口模式下修改流 ID
if (!mediaInfo.isRtpEnable() && inviteInfo == null) {
String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));
inviteInfo = inviteStreamService.getInviteInfoBySSRC(ssrc);
result.setStream_replace(inviteInfo.getStream()); result.setStream_replace(inviteInfo.getStream());
logger.info("[ZLM HOOK]推流鉴权 stream: {} 替换为 {}", param.getStream(), inviteInfo.getStream()); logger.info("[ZLM HOOK]推流鉴权 stream: {} 替换为 {}", param.getStream(), inviteInfo.getStream());
} }
}
List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, param.getStream()); // 设置音频信息及录制信息
List<SsrcTransaction> ssrcTransactionForAll = (inviteInfo == null ? null :
sessionManager.getSsrcTransactionForAll(inviteInfo.getDeviceId(), inviteInfo.getChannelId(), null, null));
if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) { if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {
String deviceId = ssrcTransactionForAll.get(0).getDeviceId(); String deviceId = ssrcTransactionForAll.get(0).getDeviceId();
String channelId = ssrcTransactionForAll.get(0).getChannelId(); String channelId = ssrcTransactionForAll.get(0).getChannelId();
DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId); DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
if (deviceChannel != null) { if (deviceChannel != null) {
result.setEnable_audio(deviceChannel.isHasAudio()); result.setEnable_audio(deviceChannel.isHasAudio());
} }
// 如果是录像下载就设置视频间隔十秒 // 如果是录像下载就设置视频间隔十秒
@ -296,8 +301,9 @@ public class ZLMHttpHookListener {
if (ssrcTransactionForAll.get(0).getType() == InviteSessionType.TALK) { if (ssrcTransactionForAll.get(0).getType() == InviteSessionType.TALK) {
result.setEnable_audio(true); result.setEnable_audio(true);
} }
} }
}
if (mediaInfo.getRecordAssistPort() > 0 && userSetting.getRecordPath() == null) { if (mediaInfo.getRecordAssistPort() > 0 && userSetting.getRecordPath() == null) {
logger.info("推流时发现尚未设置录像路径从assist服务中读取"); logger.info("推流时发现尚未设置录像路径从assist服务中读取");
JSONObject info = assistRESTfulUtils.getInfo(mediaInfo, null); JSONObject info = assistRESTfulUtils.getInfo(mediaInfo, null);
@ -684,7 +690,7 @@ public class ZLMHttpHookListener {
String deviceId = s[0]; String deviceId = s[0];
String channelId = s[1]; String channelId = s[1];
Device device = redisCatchStorage.getDevice(deviceId); Device device = redisCatchStorage.getDevice(deviceId);
if (device == null) { if (device == null || !device.isOnLine()) {
defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg())); defaultResult.setResult(new HookResult(ErrorCode.ERROR404.getCode(), ErrorCode.ERROR404.getMsg()));
return defaultResult; return defaultResult;
} }

View File

@ -120,17 +120,17 @@ public class OnStreamChangedHookParam extends HookParam{
/** /**
* H264 = 0, H265 = 1, AAC = 2, G711A = 3, G711U = 4 * H264 = 0, H265 = 1, AAC = 2, G711A = 3, G711U = 4
*/ */
private int codecId; private int codec_id;
/** /**
* CodecAAC CodecH264 * CodecAAC CodecH264
*/ */
private String codecIdName; private String codec_id_name;
/** /**
* Video = 0, Audio = 1 * Video = 0, Audio = 1
*/ */
private int codecType; private int codec_type;
/** /**
* *
@ -140,17 +140,17 @@ public class OnStreamChangedHookParam extends HookParam{
/** /**
* *
*/ */
private int sampleBit; private int sample_bit;
/** /**
* *
*/ */
private int sampleRate; private int sample_rate;
/** /**
* fps * fps
*/ */
private int fps; private float fps;
/** /**
* *
@ -162,6 +162,31 @@ public class OnStreamChangedHookParam extends HookParam{
*/ */
private int width; private int width;
/**
*
*/
private int frames;
/**
*
*/
private int key_frames;
/**
* GOP
*/
private int gop_size;
/**
* GOP(ms)
*/
private int gop_interval_ms;
/**
*
*/
private float loss;
public int getChannels() { public int getChannels() {
return channels; return channels;
} }
@ -170,28 +195,28 @@ public class OnStreamChangedHookParam extends HookParam{
this.channels = channels; this.channels = channels;
} }
public int getCodecId() { public int getCodec_id() {
return codecId; return codec_id;
} }
public void setCodecId(int codecId) { public void setCodec_id(int codec_id) {
this.codecId = codecId; this.codec_id = codec_id;
} }
public String getCodecIdName() { public String getCodec_id_name() {
return codecIdName; return codec_id_name;
} }
public void setCodecIdName(String codecIdName) { public void setCodec_id_name(String codec_id_name) {
this.codecIdName = codecIdName; this.codec_id_name = codec_id_name;
} }
public int getCodecType() { public int getCodec_type() {
return codecType; return codec_type;
} }
public void setCodecType(int codecType) { public void setCodec_type(int codec_type) {
this.codecType = codecType; this.codec_type = codec_type;
} }
public boolean isReady() { public boolean isReady() {
@ -202,27 +227,27 @@ public class OnStreamChangedHookParam extends HookParam{
this.ready = ready; this.ready = ready;
} }
public int getSampleBit() { public int getSample_bit() {
return sampleBit; return sample_bit;
} }
public void setSampleBit(int sampleBit) { public void setSample_bit(int sample_bit) {
this.sampleBit = sampleBit; this.sample_bit = sample_bit;
} }
public int getSampleRate() { public int getSample_rate() {
return sampleRate; return sample_rate;
} }
public void setSampleRate(int sampleRate) { public void setSample_rate(int sample_rate) {
this.sampleRate = sampleRate; this.sample_rate = sample_rate;
} }
public int getFps() { public float getFps() {
return fps; return fps;
} }
public void setFps(int fps) { public void setFps(float fps) {
this.fps = fps; this.fps = fps;
} }
@ -241,6 +266,46 @@ public class OnStreamChangedHookParam extends HookParam{
public void setWidth(int width) { public void setWidth(int width) {
this.width = width; this.width = width;
} }
public int getFrames() {
return frames;
}
public void setFrames(int frames) {
this.frames = frames;
}
public int getKey_frames() {
return key_frames;
}
public void setKey_frames(int key_frames) {
this.key_frames = key_frames;
}
public int getGop_size() {
return gop_size;
}
public void setGop_size(int gop_size) {
this.gop_size = gop_size;
}
public int getGop_interval_ms() {
return gop_interval_ms;
}
public void setGop_interval_ms(int gop_interval_ms) {
this.gop_interval_ms = gop_interval_ms;
}
public float getLoss() {
return loss;
}
public void setLoss(float loss) {
this.loss = loss;
}
} }
public static class OriginSock{ public static class OriginSock{

View File

@ -243,6 +243,10 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
@Override @Override
public void batchUpdateChannel(List<DeviceChannel> channels) { public void batchUpdateChannel(List<DeviceChannel> channels) {
String now = DateUtil.getNow();
for (DeviceChannel channel : channels) {
channel.setUpdateTime(now);
}
channelMapper.batchUpdate(channels); channelMapper.batchUpdate(channels);
for (DeviceChannel channel : channels) { for (DeviceChannel channel : channels) {
if (channel.getParentId() != null) { if (channel.getParentId() != null) {

View File

@ -578,7 +578,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
if (mediaServerItem.getRtspPort() != 0) { if (mediaServerItem.getRtspPort() != 0) {
param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -t 0.001 %s"); param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
} }
param.put("hook.enable","1"); param.put("hook.enable","1");
param.put("hook.on_flow_report",""); param.put("hook.on_flow_report","");

View File

@ -568,7 +568,7 @@ public class PlayServiceImpl implements IPlayService {
deviceChannel.setStreamId(streamInfo.getStream()); deviceChannel.setStreamId(streamInfo.getStream());
storager.startPlay(deviceId, channelId, streamInfo.getStream()); storager.startPlay(deviceId, channelId, streamInfo.getStream());
} }
InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAYBACK, deviceId, channelId); InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(InviteSessionType.PLAYBACK, ((OnStreamChangedHookParam) param).getStream());
if (inviteInfo != null) { if (inviteInfo != null) {
inviteInfo.setStatus(InviteSessionStatus.ok); inviteInfo.setStatus(InviteSessionStatus.ok);

View File

@ -1,37 +0,0 @@
package com.genersoft.iot.vmp.vmanager.gb28181.SseController;
import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEventListener;
import io.swagger.v3.oas.annotations.tags.Tag;
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.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
/**
* @description: SSE
* @author: lawrencehj
* @data: 2021-01-20
*/
@Tag(name = "SSE推送")
@Controller
@RequestMapping("/api")
public class SseController {
@Autowired
AlarmEventListener alarmEventListener;
@GetMapping("/emit")
public SseEmitter emit(@RequestParam String browserId) {
final SseEmitter sseEmitter = new SseEmitter(0L);
try {
alarmEventListener.addSseEmitters(browserId, sseEmitter);
}catch (Exception e){
sseEmitter.completeWithError(e);
}
return sseEmitter;
}
}

View File

@ -0,0 +1,55 @@
package com.genersoft.iot.vmp.vmanager.gb28181.sse;
import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEventListener;
import io.swagger.v3.oas.annotations.tags.Tag;
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.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
/**
* SSE .
*
* @author lawrencehj
* @author <a href="mailto:xiaoQQya@126.com">xiaoQQya</a>
* @since 2021/01/20
*/
@Tag(name = "SSE 推送")
@RestController
@RequestMapping("/api")
public class SseController {
@Resource
private AlarmEventListener alarmEventListener;
/**
* SSE .
*
* @param response
* @param browserId ID
* @throws IOException IOEXCEPTION
* @author <a href="mailto:xiaoQQya@126.com">xiaoQQya</a>
* @since 2023/11/06
*/
@GetMapping("/emit")
public void emit(HttpServletResponse response, @RequestParam String browserId) throws IOException, InterruptedException {
response.setContentType("text/event-stream");
response.setCharacterEncoding("utf-8");
PrintWriter writer = response.getWriter();
alarmEventListener.addSseEmitter(browserId, writer);
while (!writer.checkError()) {
Thread.sleep(1000);
writer.write(":keep alive\n\n");
writer.flush();
}
alarmEventListener.removeSseEmitter(browserId, writer);
}
}

View File

@ -4,8 +4,8 @@
<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/> <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
<property name="LOG_HOME" value="logs" /> <property name="LOG_HOME" value="logs" />
<substitutionProperty name="log.pattern" value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr(%-1.30logger{0}){cyan} %clr(:){faint} %m%n%wEx"/> <substitutionProperty name="log.pattern"
value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr([%thread]) %clr(%5p) %clr(---){faint} %clr(%logger{50}){cyan}%clr(:) %clr(%L){cyan} %m%n%wEx"/>
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/> <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/> <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/> <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
@ -86,7 +86,7 @@
<!-- 日志输出级别 --> <!-- 日志输出级别 -->
<root level="DEBUG"> <root level="INFO">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />
</root> </root>

View File

@ -1,6 +1,6 @@
<template> <template>
<div ref="container" @dblclick="fullscreenSwich" <div ref="container" @dblclick="fullscreenSwich"
style="width:100%;height:100%;background-color: #000000;margin:0 auto;"> style="width:100%;height:100%;background-color: #000000;margin:0 auto;position: relative;">
<div class="buttons-box" id="buttonsBox"> <div class="buttons-box" id="buttonsBox">
<div class="buttons-box-left"> <div class="buttons-box-left">
<i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i> <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
@ -47,10 +47,6 @@ export default {
}, },
props: ['videoUrl', 'error', 'hasAudio', 'height'], props: ['videoUrl', 'error', 'hasAudio', 'height'],
mounted() { mounted() {
window.onerror = (msg) => {
// console.error(msg)
};
console.log(this._uid)
let paramUrl = decodeURIComponent(this.$route.params.url) let paramUrl = decodeURIComponent(this.$route.params.url)
this.$nextTick(() => { this.$nextTick(() => {
this.updatePlayerDomSize() this.updatePlayerDomSize()
@ -61,15 +57,17 @@ export default {
this.videoUrl = paramUrl; this.videoUrl = paramUrl;
} }
this.btnDom = document.getElementById("buttonsBox"); this.btnDom = document.getElementById("buttonsBox");
console.log("初始化时的地址为: " + this.videoUrl)
this.play(this.videoUrl)
}) })
}, },
watch: { watch: {
videoUrl(newData, oldData) { videoUrl: {
this.play(newData) handler(val, _) {
this.$nextTick(() => {
this.play(val);
})
}, },
immediate: true immediate: true
}
}, },
methods: { methods: {
updatePlayerDomSize() { updatePlayerDomSize() {
@ -87,30 +85,25 @@ export default {
dom.style.height = height + "px"; dom.style.height = height + "px";
}, },
create() { create() {
let options = {}; let options = {
console.log("hasAudio " + this.hasAudio)
jessibucaPlayer[this._uid] = new window.Jessibuca(Object.assign(
{
container: this.$refs.container, container: this.$refs.container,
autoWasm: true, autoWasm: true,
background: "", background: "",
controlAutoHide: false, controlAutoHide: false,
debug: false, debug: false,
decoder: "static/js/jessibuca/decoder.js", decoder: "static/js/jessibuca/decoder.js",
forceNoOffscreen: true, forceNoOffscreen: false,
hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio, hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio,
hasVideo: true,
heartTimeout: 5, heartTimeout: 5,
heartTimeoutReplay: true, heartTimeoutReplay: true,
heartTimeoutReplayTimes: 3, heartTimeoutReplayTimes: 3,
hiddenAutoPause: false, hiddenAutoPause: false,
hotKey: false, hotKey: true,
isFlv: false, isFlv: false,
isFullResize: false, isFullResize: false,
isNotMute: this.isNotMute, isNotMute: this.isNotMute,
isResize: false, isResize: false,
keepScreenOn: false, keepScreenOn: true,
loadingText: "请稍等, 视频加载中......", loadingText: "请稍等, 视频加载中......",
loadingTimeout: 10, loadingTimeout: 10,
loadingTimeoutReplay: true, loadingTimeoutReplay: true,
@ -123,34 +116,23 @@ export default {
audio: false, audio: false,
record: false record: false
}, },
recordType: "webm", recordType: "mp4",
rotate: 0, rotate: 0,
showBandwidth: false, showBandwidth: false,
supportDblclickFullscreen: false, supportDblclickFullscreen: false,
timeout: 10, timeout: 10,
useMSE: location.hostname !== "localhost" && location.protocol !== "https:", useMSE: true,
useOffscreen: false, useWCS: location.hostname === "localhost" || location.protocol === "https:",
useWCS: location.hostname === "localhost" || location.protocol === "https", useWebFullScreen: true,
useWebFullScreen: false, videoBuffer: 0.1,
videoBuffer: 0,
wasmDecodeAudioSyncVideo: true,
wasmDecodeErrorReplay: true, wasmDecodeErrorReplay: true,
wcsUseVideoRender: true wcsUseVideoRender: true
}, };
options console.log("Jessibuca -> options: ", options);
)); jessibucaPlayer[this._uid] = new window.Jessibuca({...options});
let jessibuca = jessibucaPlayer[this._uid]; let jessibuca = jessibucaPlayer[this._uid];
let _this = this; let _this = this;
jessibuca.on("load", function () {
console.log("on load init");
});
jessibuca.on("log", function (msg) {
console.log("on log", msg);
});
jessibuca.on("record", function (msg) {
console.log("on record:", msg);
});
jessibuca.on("pause", function () { jessibuca.on("pause", function () {
_this.playing = false; _this.playing = false;
}); });
@ -158,44 +140,11 @@ export default {
_this.playing = true; _this.playing = true;
}); });
jessibuca.on("fullscreen", function (msg) { jessibuca.on("fullscreen", function (msg) {
console.log("on fullscreen", msg);
_this.fullscreen = msg _this.fullscreen = msg
}); });
jessibuca.on("mute", function (msg) { jessibuca.on("mute", function (msg) {
console.log("on mute", msg);
_this.isNotMute = !msg; _this.isNotMute = !msg;
}); });
jessibuca.on("audioInfo", function (msg) {
console.log("audioInfo", msg);
});
jessibuca.on("bps", function (bps) {
// console.log('bps', bps);
});
let _ts = 0;
jessibuca.on("timeUpdate", function (ts) {
// console.log('timeUpdate,old,new,timestamp', _ts, ts, ts - _ts);
_ts = ts;
});
jessibuca.on("videoInfo", function (info) {
console.log("videoInfo", info);
});
jessibuca.on("error", function (error) {
console.log("error", error);
});
jessibuca.on("timeout", function () {
console.log("timeout");
});
jessibuca.on('start', function () {
console.log('start');
})
jessibuca.on("performance", function (performance) { jessibuca.on("performance", function (performance) {
let show = "卡顿"; let show = "卡顿";
if (performance === 2) { if (performance === 2) {
@ -205,33 +154,36 @@ export default {
} }
_this.performance = show; _this.performance = show;
}); });
jessibuca.on('buffer', function (buffer) {
// console.log('buffer', buffer);
})
jessibuca.on('stats', function (stats) {
// console.log('stats', stats);
})
jessibuca.on('kBps', function (kBps) { jessibuca.on('kBps', function (kBps) {
_this.kBps = Math.round(kBps); _this.kBps = Math.round(kBps);
}); });
jessibuca.on("videoInfo", function (msg) {
// PTS console.log("Jessibuca -> videoInfo: ", msg);
jessibuca.on('videoFrame', function () { });
jessibuca.on("audioInfo", function (msg) {
}) console.log("Jessibuca -> audioInfo: ", msg);
});
// jessibuca.on("error", function (msg) {
jessibuca.on('metadata', function () { console.log("Jessibuca -> error: ", msg);
});
jessibuca.on("timeout", function (msg) {
console.log("Jessibuca -> timeout: ", msg);
});
jessibuca.on("loadingTimeout", function (msg) {
console.log("Jessibuca -> timeout: ", msg);
});
jessibuca.on("delayTimeout", function (msg) {
console.log("Jessibuca -> timeout: ", msg);
});
jessibuca.on("playToRenderTimes", function (msg) {
console.log("Jessibuca -> playToRenderTimes: ", msg);
}); });
}, },
playBtnClick: function (event) { playBtnClick: function (event) {
this.play(this.videoUrl) this.play(this.videoUrl)
}, },
play: function (url) { play: function (url) {
console.log(url) console.log("Jessibuca -> url: ", url);
if (jessibucaPlayer[this._uid]) { if (jessibucaPlayer[this._uid]) {
this.destroy(); this.destroy();
} }
@ -245,7 +197,6 @@ export default {
jessibucaPlayer[this._uid].play(url); jessibucaPlayer[this._uid].play(url);
} else { } else {
jessibucaPlayer[this._uid].on("load", () => { jessibucaPlayer[this._uid].on("load", () => {
console.log("load 播放")
jessibucaPlayer[this._uid].play(url); jessibucaPlayer[this._uid].play(url);
}); });
} }
@ -286,11 +237,6 @@ export default {
this.performance = ""; this.performance = "";
}, },
eventcallbacK: function (type, message) {
// console.log("player ")
// console.log(type)
// console.log(message)
},
fullscreenSwich: function () { fullscreenSwich: function () {
let isFull = this.isFullscreen() let isFull = this.isFullscreen()
jessibucaPlayer[this._uid].setFullscreen(!isFull) jessibucaPlayer[this._uid].setFullscreen(!isFull)

View File

@ -1,7 +1,7 @@
<template> <template>
<div id="devicePlayer" v-loading="isLoging"> <div id="devicePlayer" v-loading="isLoging">
<el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()"> <el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()" v-if="showVideoDialog">
<div style="width: 100%; height: 100%"> <div style="width: 100%; height: 100%">
<el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer"
v-if="Object.keys(this.player).length > 1"> v-if="Object.keys(this.player).length > 1">

View File

@ -37,7 +37,6 @@
</template> </template>
<script> <script>
import changePasswordDialog from '../components/dialog/changePassword.vue' import changePasswordDialog from '../components/dialog/changePassword.vue'
import userService from '../components/service/UserService' import userService from '../components/service/UserService'
import {Notification} from 'element-ui'; import {Notification} from 'element-ui';
@ -55,18 +54,19 @@ export default {
}; };
}, },
created() { created() {
console.log(4444)
console.log(JSON.stringify(userService.getUser())) console.log(JSON.stringify(userService.getUser()))
if (this.$route.path.startsWith("/channelList")) { if (this.$route.path.startsWith("/channelList")) {
this.activeIndex = "/deviceList" this.activeIndex = "/deviceList"
} }
}, },
mounted() { mounted() {
window.addEventListener('beforeunload', e => this.beforeunloadHandler(e)) window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
// window.addEventListener('unload', e => this.unloadHandler(e))
this.alarmNotify = this.getAlarmSwitchStatus() === "true"; this.alarmNotify = this.getAlarmSwitchStatus() === "true";
this.sseControl();
// TODO: sse, sse browserId ,
setTimeout(() => {
this.sseControl()
}, 3000);
}, },
methods: { methods: {
loginout() { loginout() {
@ -107,10 +107,12 @@ export default {
this.sseSource = new EventSource('/api/emit?browserId=' + this.$browserId); this.sseSource = new EventSource('/api/emit?browserId=' + this.$browserId);
this.sseSource.addEventListener('message', function (evt) { this.sseSource.addEventListener('message', function (evt) {
that.$notify({ that.$notify({
title: '收到报警信息', title: '报警信息',
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
message: evt.data, message: evt.data,
type: 'warning' type: 'warning',
position: 'bottom-right',
duration: 3000
}); });
console.log("收到信息:" + evt.data); console.log("收到信息:" + evt.data);
}); });

View File

@ -1,22 +1,20 @@
import Vue from 'vue'; import Vue from 'vue';
import App from './App.vue'; import App from './App.vue';
import ElementUI, {Notification} from 'element-ui';
Vue.config.productionTip = false;
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css'; import 'element-ui/lib/theme-chalk/index.css';
import router from './router/index.js'; import router from './router/index.js';
import axios from 'axios'; import axios from 'axios';
import VueCookies from 'vue-cookies'; import VueCookies from 'vue-cookies';
import echarts from 'echarts';
import VCharts from 'v-charts'; import VCharts from 'v-charts';
import VueClipboard from 'vue-clipboard2'; import VueClipboard from 'vue-clipboard2';
import {Notification} from 'element-ui';
import Fingerprint2 from 'fingerprintjs2'; import Fingerprint2 from 'fingerprintjs2';
import VueClipboards from 'vue-clipboards'; import VueClipboards from 'vue-clipboards';
import Contextmenu from "vue-contextmenujs" import Contextmenu from "vue-contextmenujs"
import userService from "./components/service/UserService" import userService from "./components/service/UserService"
Vue.config.productionTip = false;
// 生成唯一ID // 生成唯一ID
Fingerprint2.get(function (components) { Fingerprint2.get(function (components) {
@ -29,10 +27,9 @@ Fingerprint2.get(function (components) {
//console.log(values) //使用的浏览器信息npm //console.log(values) //使用的浏览器信息npm
// 生成最终id // 生成最终id
let port = window.location.port; let port = window.location.port;
console.log(port);
const fingerPrint = Fingerprint2.x64hash128(values.join(port), 31) const fingerPrint = Fingerprint2.x64hash128(values.join(port), 31)
Vue.prototype.$browserId = fingerPrint; Vue.prototype.$browserId = fingerPrint;
console.log("唯一标识码:" + fingerPrint); console.log("浏览器 ID: " + fingerPrint);
}); });
Vue.use(VueClipboard); Vue.use(VueClipboard);

View File

@ -561,9 +561,9 @@ declare class Jessibuca {
buf: number; buf: number;
/** 当前视频帧率 */ /** 当前视频帧率 */
fps: number; fps: number;
/** 当前音频码率单位bit */ /** 当前音频码率单位byte */
abps: number; abps: number;
/** 当前视频码率单位bit */ /** 当前视频码率单位byte */
vbps: number; vbps: number;
/** 当前视频帧pts单位毫秒 */ /** 当前视频帧pts单位毫秒 */
ts: number; ts: number;

File diff suppressed because one or more lines are too long