Browse Source

修复WebUi长时间不退出登录的BUG

648540858 10 months ago
parent
commit
5bbd461d88

+ 1 - 1
src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java

@@ -46,7 +46,7 @@ public class JwtUtils implements InitializingBean {
     /**
      * token过期时间(分钟)
      */
-    public static final long EXPIRATION_TIME = 30 * 24 * 60;
+    public static final long EXPIRATION_TIME = 30;
 
     private static RsaJsonWebKey rsaJsonWebKey;
 

+ 1 - 1
src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java

@@ -269,7 +269,7 @@ public class DeviceQuery {
 	@Operation(summary = "修改数据流传输模式", security = @SecurityRequirement(name = JwtUtils.HEADER))
 	@Parameter(name = "deviceId", description = "设备国标编号", required = true)
 	@Parameter(name = "streamMode", description = "数据流传输模式, 取值:" +
-			"UDP(udp传输),TCP-ACTIVE(tcp主动模式,暂不支持),TCP-PASSIVE(tcp被动模式)", required = true)
+			"UDP(udp传输),TCP-ACTIVE(tcp主动模式),TCP-PASSIVE(tcp被动模式)", required = true)
 	@PostMapping("/transport/{deviceId}/{streamMode}")
 	public void updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
 		Device device = deviceService.getDeviceByDeviceId(deviceId);

+ 0 - 39
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java

@@ -578,45 +578,6 @@ public class PlatformServiceImpl implements IPlatformService {
 
             inviteOKHandler(event, ssrcInfo, tcpMode, ssrcCheck, mediaServerItem, platform, channel, timeOutTaskKey,
                     null, inviteInfo, InviteSessionType.BROADCAST);
-//            // 收到200OK 检测ssrc是否有变化,防止上级自定义了ssrc
-//            ResponseEvent responseEvent = (ResponseEvent) event.event;
-//            String contentString = new String(responseEvent.getResponse().getRawContent());
-//            // 获取ssrc
-//            int ssrcIndex = contentString.indexOf("y=");
-//            // 检查是否有y字段
-//            if (ssrcIndex >= 0) {
-//                //ssrc规定长度为10字节,不取余下长度以避免后续还有“f=”字段 TODO 后续对不规范的非10位ssrc兼容
-//                String ssrcInResponse = contentString.substring(ssrcIndex + 2, ssrcIndex + 12);
-//                // 查询到ssrc不一致且开启了ssrc校验则需要针对处理
-//                if (ssrcInfo.getSsrc().equals(ssrcInResponse) || ssrcCheck) {
-//                    tcpActiveHandler(platform, )
-//                    return;
-//                }
-//                logger.info("[点播消息] 收到invite 200, 发现下级自定义了ssrc: {}", ssrcInResponse);
-//                if (!mediaServerItem.isRtpEnable()) {
-//                    logger.info("[点播消息] SSRC修正 {}->{}", ssrcInfo.getSsrc(), ssrcInResponse);
-//                    // 释放ssrc
-//                    mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
-//                    // 单端口模式streamId也有变化,需要重新设置监听
-//                    if (!mediaServerItem.isRtpEnable()) {
-//                        // 添加订阅
-//                        HookSubscribeForStreamChange hookSubscribe = HookSubscribeFactory.on_stream_changed("rtp", ssrcInfo.getStream(), true, "rtsp", mediaServerItem.getId());
-//                        subscribe.removeSubscribe(hookSubscribe);
-//                        hookSubscribe.getContent().put("stream", String.format("%08x", Integer.parseInt(ssrcInResponse)).toUpperCase());
-//                        subscribe.addSubscribe(hookSubscribe, (mediaServerItemInUse, hookParam) -> {
-//                            logger.info("[ZLM HOOK] ssrc修正后收到订阅消息: " + hookParam);
-//                            dynamicTask.stop(timeOutTaskKey);
-//                            // hook响应
-//                            playService.onPublishHandlerForPlay(mediaServerItemInUse, hookParam, platform.getServerGBId(), channelId);
-//                            hookEvent.response(mediaServerItemInUse, hookParam);
-//                        });
-//                    }
-//                    // 关闭rtp server
-//                    mediaServerService.closeRTPServer(mediaServerItem, ssrcInfo.getStream());
-//                    // 重新开启ssrc server
-//                    mediaServerService.openRTPServer(mediaServerItem, ssrcInfo.getStream(), ssrcInResponse, false, false, ssrcInfo.getPort(), true, false, tcpMode);
-//                }
-//            }
         }, eventResult -> {
             // 收到错误回复
             if (errorEvent != null) {