Merge pull request #1137 from xiaoQQya/develop

bugfix: 修复推流鉴权、报警推送等问题

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.2</version>
+        <version>2.7.17</version>
     </parent>
 
     <groupId>com.genersoft</groupId>
@@ -30,6 +30,7 @@
             </releases>
         </repository>
     </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>nexus-aliyun</id>
@@ -130,9 +131,9 @@
 
         <!-- mysql数据库 -->
         <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>
 
         <!--postgresql-->
@@ -144,8 +145,8 @@
 
         <!-- 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>
             <groupId>com.kingbase</groupId>
             <artifactId>kingbase8</artifactId>
@@ -165,7 +166,18 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <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>
@@ -207,12 +219,6 @@
             <version>2.1.3</version>
         </dependency>
 
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>20.0</version>
-		</dependency>
-
         <!-- json解析库fastjson2 -->
         <dependency>
             <groupId>com.alibaba.fastjson2</groupId>
@@ -247,11 +253,11 @@
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
-<!--		<dependency>-->
+        <!--		<dependency>-->
-<!--			<groupId>net.sf.kxml</groupId>-->
+        <!--			<groupId>net.sf.kxml</groupId>-->
-<!--			<artifactId>kxml2</artifactId>-->
+        <!--			<artifactId>kxml2</artifactId>-->
-<!--			<version>2.3.0</version>-->
+        <!--			<version>2.3.0</version>-->
-<!--		</dependency>-->
+        <!--		</dependency>-->
 
         <!-- jwt实现 -->
         <dependency>
@@ -271,7 +277,18 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <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>
 
         <!-- 获取系统信息 -->
@@ -286,31 +303,28 @@
             <artifactId>spring-session-core</artifactId>
         </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>-->
-<!--			<version>1.0.8</version>-->
+        <!--    <version>1.0.8</version>-->
-<!--		</dependency>-->
+        <!--</dependency>-->
 
         <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-			<version>31.1-jre</version>
+            <version>32.1.3-jre</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-<!--			<scope>test</scope>-->
+            <scope>test</scope>
         </dependency>
-
     </dependencies>
 
-
     <build>
         <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
         <plugins>
@@ -322,6 +336,7 @@
                     <includeSystemScope>true</includeSystemScope>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -351,7 +366,6 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-
         </plugins>
         <resources>
             <resource>

src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java

@@ -1,12 +1,12 @@
 package com.genersoft.iot.vmp.conf.security;
 
 import com.genersoft.iot.vmp.conf.UserSetting;
-import org.springframework.core.annotation.Order;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -28,6 +28,7 @@ import java.util.Arrays;
 
 /**
  * 配置Spring Security
+ *
  * @author lin
  */
 @Configuration
@@ -75,6 +76,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
             matchers.add("/js/**");
             matchers.add("/api/device/query/snap/**");
             matchers.add("/record_proxy/*/**");
+            matchers.add("/api/emit");
             matchers.addAll(userSetting.getInterfaceAuthenticationExcludes());
             // 可以直接访问的静态数据
             web.ignoring().antMatchers(matchers.toArray(new String[0]));
@@ -83,6 +85,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     /**
      * 配置认证方式
+     *
      * @param auth
      * @throws Exception
      */
@@ -111,7 +114,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .authorizeRequests()
                 .requestMatchers(CorsUtils::isPreFlightRequest).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()
                 // 异常处理器
                 .and()
@@ -124,7 +127,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     }
 
-    CorsConfigurationSource configurationSource(){
+    CorsConfigurationSource configurationSource() {
         // 配置跨域
         CorsConfiguration corsConfiguration = new CorsConfiguration();
         corsConfiguration.setAllowedHeaders(Arrays.asList("*"));
@@ -135,7 +138,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         corsConfiguration.setExposedHeaders(Arrays.asList(JwtUtils.getHeader()));
 
         UrlBasedCorsConfigurationSource url = new UrlBasedCorsConfigurationSource();
-        url.registerCorsConfiguration("/**",corsConfiguration);
+        url.registerCorsConfiguration("/**", corsConfiguration);
         return url;
     }
 

src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java

@@ -1,55 +1,68 @@
 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.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
 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
-    public void onApplicationEvent(AlarmEvent event) {
+    public void onApplicationEvent(@NotNull AlarmEvent event) {
         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 {
-                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();
             }
         }

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -244,7 +244,6 @@ public class ZLMHttpHookListener {
 
 
         HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();
-        result.setEnable_audio(true);
         taskExecutor.execute(() -> {
             ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);
             if (subscribe != null) {
@@ -262,16 +261,21 @@ public class ZLMHttpHookListener {
         } else {
             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())) {
+            String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));
             InviteInfo inviteInfo = inviteStreamService.getInviteInfoBySSRC(ssrc);
-            if (inviteInfo != null) {
+
+            // 单端口模式下修改流 ID
+            if (!mediaInfo.isRtpEnable() && inviteInfo != null) {
                 result.setStream_replace(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) {
                 String deviceId = ssrcTransactionForAll.get(0).getDeviceId();
                 String channelId = ssrcTransactionForAll.get(0).getChannelId();
@@ -285,6 +289,8 @@ public class ZLMHttpHookListener {
                     result.setEnable_mp4(true);
                 }
             }
+        }
+
         if (mediaInfo.getRecordAssistPort() > 0 && userSetting.getRecordPath() == null) {
             logger.info("推流时发现尚未设置录像路径，从assist服务中读取");
             JSONObject info = assistRESTfulUtils.getInfo(mediaInfo, null);

src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -569,7 +569,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
         Map<String, Object> param = new HashMap<>();
         param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
         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.on_flow_report","");

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/SseController/SseController.java

@@ -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;
-    }
-}

src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/sse/SseController.java

@@ -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);
+    }
+}

web_src/src/components/common/jessibuca.vue

@@ -1,6 +1,6 @@
 <template>
   <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-left">
         <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
@@ -47,10 +47,6 @@ export default {
   },
   props: ['videoUrl', 'error', 'hasAudio', 'height'],
   mounted() {
-    window.onerror = (msg) => {
-      // console.error(msg)
-    };
-    console.log(this._uid)
     let paramUrl = decodeURIComponent(this.$route.params.url)
     this.$nextTick(() => {
       this.updatePlayerDomSize()
@@ -61,15 +57,17 @@ export default {
         this.videoUrl = paramUrl;
       }
       this.btnDom = document.getElementById("buttonsBox");
-      console.log("初始化时的地址为: " + this.videoUrl)
-      this.play(this.videoUrl)
     })
   },
   watch: {
-    videoUrl(newData, oldData) {
+    videoUrl: {
-      this.play(newData)
+      handler(val, _) {
+        this.$nextTick(() => {
+          this.play(val);
+        })
       },
       immediate: true
+    }
   },
   methods: {
     updatePlayerDomSize() {
@@ -87,30 +85,25 @@ export default {
       dom.style.height = height + "px";
     },
     create() {
-      let options = {};
+      let options = {
-      console.log("hasAudio  " + this.hasAudio)
-
-      jessibucaPlayer[this._uid] = new window.Jessibuca(Object.assign(
-        {
         container: this.$refs.container,
         autoWasm: true,
         background: "",
         controlAutoHide: false,
         debug: false,
         decoder: "static/js/jessibuca/decoder.js",
-          forceNoOffscreen: true,
+        forceNoOffscreen: false,
         hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio,
-          hasVideo: true,
         heartTimeout: 5,
         heartTimeoutReplay: true,
         heartTimeoutReplayTimes: 3,
         hiddenAutoPause: false,
-          hotKey: false,
+        hotKey: true,
         isFlv: false,
         isFullResize: false,
         isNotMute: this.isNotMute,
         isResize: false,
-          keepScreenOn: false,
+        keepScreenOn: true,
         loadingText: "请稍等, 视频加载中......",
         loadingTimeout: 10,
         loadingTimeoutReplay: true,
@@ -123,34 +116,23 @@ export default {
           audio: false,
           record: false
         },
-          recordType: "webm",
+        recordType: "mp4",
         rotate: 0,
         showBandwidth: false,
         supportDblclickFullscreen: false,
         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,
         wcsUseVideoRender: true
-        },
+      };
-        options
+      console.log("Jessibuca -> options: ", options);
-      ));
+      jessibucaPlayer[this._uid] = new window.Jessibuca({...options});
+
       let jessibuca = jessibucaPlayer[this._uid];
       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 () {
         _this.playing = false;
       });
@@ -158,44 +140,11 @@ export default {
         _this.playing = true;
       });
       jessibuca.on("fullscreen", function (msg) {
-        console.log("on fullscreen", msg);
         _this.fullscreen = msg
       });
-
       jessibuca.on("mute", function (msg) {
-        console.log("on mute", 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) {
         let show = "卡顿";
         if (performance === 2) {
@@ -205,33 +154,36 @@ export default {
         }
         _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) {
         _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) {
       this.play(this.videoUrl)
     },
     play: function (url) {
-      console.log(url)
+      console.log("Jessibuca -> url: ", url);
       if (jessibucaPlayer[this._uid]) {
         this.destroy();
       }
@@ -245,7 +197,6 @@ export default {
         jessibucaPlayer[this._uid].play(url);
       } else {
         jessibucaPlayer[this._uid].on("load", () => {
-          console.log("load 播放")
           jessibucaPlayer[this._uid].play(url);
         });
       }
@@ -286,11 +237,6 @@ export default {
       this.performance = "";
 
     },
-    eventcallbacK: function (type, message) {
-      // console.log("player 事件回调")
-      // console.log(type)
-      // console.log(message)
-    },
     fullscreenSwich: function () {
       let isFull = this.isFullscreen()
       jessibucaPlayer[this._uid].setFullscreen(!isFull)

web_src/src/components/dialog/devicePlayer.vue

@@ -1,7 +1,7 @@
 <template>
 <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%">
         <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer" v-if="Object.keys(this.player).length > 1">
 <!--          <el-tab-pane label="LivePlayer" name="livePlayer">-->

web_src/src/layout/UiHeader.vue

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

web_src/src/main.js

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

web_src/static/js/jessibuca/jessibuca.d.ts

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