fix bug

itning · Dec 26, 2019 · 5cb9535 · 5cb9535
1 parent b4402c9
commit 5cb9535
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/pic/start_template.sh b/pic/start_template.sh
@@ -1,2 +1,2 @@
-nohup java -jar yunshu-nas-0.0.1-SNAPSHOT.jar --nas.ffmpeg-bin-dir=/home/shw/ffmpeg-4.2.1-amd64-static --nas.out-dir=/home/shw/a --nas.aria2c-file=/usr/local/bin/aria2c >log.log 2>&1 &
+nohup java -jar yunshu-nas-1.1.0.RELEASE.jar --nas.ffmpeg-bin-dir=/home/shw/ffmpeg-4.2.1-amd64-static --nas.out-dir=/home/shw/a --nas.aria2c-file=/usr/local/bin/aria2c >log.log 2>&1 &
 nohup aria2c --rpc-listen-port 6800 --enable-rpc --rpc-listen-all >aria2c.log 2>&1 &
diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.9.RELEASE</version>
+        <version>2.2.2.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>top.itning.yunshu</groupId>
     <artifactId>yunshu-nas</artifactId>
-    <version>1.0.0.RELEASE</version>
+    <version>1.1.0.RELEASE</version>
     <name>yunshu-nas</name>
     <description>Demo project for Spring Boot</description>
 
@@ -86,6 +86,11 @@
     </dependencies>
 
     <repositories>
+        <repository>
+            <id>nexus-aliyun</id>
+            <name>Nexus aliyun</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>

diff --git a/src/main/java/top/itning/yunshu/yunshunas/entity/Link.java b/src/main/java/top/itning/yunshu/yunshunas/entity/Link.java
@@ -24,7 +24,6 @@ public class Link {
         } else {
             SPLIT_REGEX = "/";
         }
-        SPLIT_REGEX = "/";
     }
 
     public static List<Link> build(String location) throws UnsupportedEncodingException {

diff --git a/src/main/resources/templates/video.html b/src/main/resources/templates/video.html
@@ -26,9 +26,9 @@
                                              th:text="${link.name}"></a><span>&#92;</span></span>
         </div>
     </div>
-    <video id="video-id" class="video-js vjs-default-skin vjs-big-play-centered vjs-fluid" controls preload="auto">
+    <video-js id="video-id" class="video-js vjs-default-skin vjs-big-play-centered vjs-fluid" controls preload="auto">
         <source th:src="${'/hls/'+name+'.m3u8'}" type="application/x-mpegURL">
-    </video>
+    </video-js>
     <button class="mdui-btn mdui-btn-raised mdui-ripple mdui-color-theme-accent mdui-btn-dense mdui-m-t-1 mdui-m-b-1"
             onclick="del()">删除
     </button>
@@ -60,6 +60,7 @@
 <script th:src="@{/mdui/js/mdui.min.js}"></script>
 <script th:inline="javascript">
     'use strict';
+    window.HELP_IMPROVE_VIDEOJS = false;
     const $$ = mdui.JQ;
     const links = [[${links}]];
     const name = [[${name}]];
@@ -68,14 +69,18 @@
     $$(function () {
         window.scrollTo(0, 0);
     });
-
-    videojs('video-id', {playbackRates: [0.5, 1, 1.5, 2, 2.5, 3]}).ready(function () {
-        this.hotkeys({
-            volumeStep: 0.1,
-            seekStep: 5,
-            enableModifiersForNumbers: false
+    // overrideNative=true为MSE
+    videojs('video-id', {
+        playbackRates: [0.5, 1, 1.5, 2, 2.5, 3],
+        html5: {hls: {overrideNative: !videojs.browser.IS_SAFARI}}
+    })
+        .ready(function () {
+            this.hotkeys({
+                volumeStep: 0.1,
+                seekStep: 5,
+                enableModifiersForNumbers: false
+            });
         });
-    });
 
     //player.playbackRate(speed);