Merge branch 'lxl' into 'master'

feat: 注释重定向

See merge request !7

build/asset-manifest.json

@@ -113,8 +113,8 @@
     "python-class.css": "/mrstaticcss/python-class.9cf694ed.chunk.css",
     "python-class.js": "/mrstaticjs/python-class.529fb3ff.chunk.js",
     "python-class.js.map": "/mrstaticjs/python-class.529fb3ff.chunk.js.map",
-    "runtime-main.js": "/mrstaticjs/runtime-main.90c000c8.js",
-    "runtime-main.js.map": "/mrstaticjs/runtime-main.90c000c8.js.map",
+    "runtime-main.js": "/mrstaticjs/runtime-main.db6c903a.js",
+    "runtime-main.js.map": "/mrstaticjs/runtime-main.db6c903a.js.map",
     "search.css": "/mrstaticcss/search.1eccf844.chunk.css",
     "search.js": "/mrstaticjs/search.4ec2d37f.chunk.js",
     "search.js.map": "/mrstaticjs/search.4ec2d37f.chunk.js.map",
@@ -139,8 +139,8 @@
     "ts-test.js": "/mrstaticjs/ts-test.c875c81e.chunk.js",
     "ts-test.js.map": "/mrstaticjs/ts-test.c875c81e.chunk.js.map",
     "video.css": "/mrstaticcss/video.ccb728a0.chunk.css",
-    "video.js": "/mrstaticjs/video.9bb6e3a4.chunk.js",
-    "video.js.map": "/mrstaticjs/video.9bb6e3a4.chunk.js.map",
+    "video.js": "/mrstaticjs/video.b8200fcf.chunk.js",
+    "video.js.map": "/mrstaticjs/video.b8200fcf.chunk.js.map",
     "mrstaticjs/49.2200b24b.chunk.js": "/mrstaticjs/49.2200b24b.chunk.js",
     "mrstaticjs/49.2200b24b.chunk.js.map": "/mrstaticjs/49.2200b24b.chunk.js.map",
     "mrstaticcss/50.10201311.chunk.css": "/mrstaticcss/50.10201311.chunk.css",
@@ -281,11 +281,11 @@
     "mrstaticmedia/kanjia_cg_icon.png": "/mrstaticmedia/kanjia_cg_icon.81a489ac.png",
     "mrstaticmedia/video.scss": "/mrstaticmedia/progress-share-bg.80011994.png",
     "mrstaticmedia/tanchuang.png": "/mrstaticmedia/tanchuang.de9468e5.png",
-    "precache-manifest.11ccf59c84d84583fcd96edc2d9a9ee9.js": "/precache-manifest.11ccf59c84d84583fcd96edc2d9a9ee9.js",
+    "precache-manifest.c1b53d438ec5c3d8881c50f52e064c35.js": "/precache-manifest.c1b53d438ec5c3d8881c50f52e064c35.js",
     "service-worker.js": "/service-worker.js"
   },
   "entrypoints": [
-    "mrstaticjs/runtime-main.90c000c8.js",
+    "mrstaticjs/runtime-main.db6c903a.js",
     "mrstaticcss/50.10201311.chunk.css",
     "mrstaticjs/50.c39c7b28.chunk.js",
     "mrstaticcss/main.68a60aea.chunk.css",

build/precache-manifest.11ccf59c84d84583fcd96edc2d9a9ee9.js → build/precache-manifest.c1b53d438ec5c3d8881c50f52e064c35.js

 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "e71b4c47618c9947b2aa39671c8df5b1",
+    "revision": "e6c748b0461f5b2ddc79003b8a63ff1c",
     "url": "/index.html"
   },
   {
@@ -248,7 +248,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/mrstaticcss/treasure-box-mybox.c6914a65.chunk.css"
   },
   {
-    "revision": "774598d646acd4917827",
+    "revision": "de71de57901b8f25b8d4",
     "url": "/mrstaticcss/video.ccb728a0.chunk.css"
   },
   {
@@ -516,8 +516,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/mrstaticjs/python-class.529fb3ff.chunk.js"
   },
   {
-    "revision": "1176adf6a993136793c2",
-    "url": "/mrstaticjs/runtime-main.90c000c8.js"
+    "revision": "c35d17b7ab2f894a0080",
+    "url": "/mrstaticjs/runtime-main.db6c903a.js"
   },
   {
     "revision": "6f2094c4ab9bebacf5ea",
@@ -552,8 +552,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/mrstaticjs/ts-test.c875c81e.chunk.js"
   },
   {
-    "revision": "774598d646acd4917827",
-    "url": "/mrstaticjs/video.9bb6e3a4.chunk.js"
+    "revision": "de71de57901b8f25b8d4",
+    "url": "/mrstaticjs/video.b8200fcf.chunk.js"
   },
   {
     "revision": "3e15699f5449cb39a7afaa991396bc54",

build/service-worker.js

@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.11ccf59c84d84583fcd96edc2d9a9ee9.js"
+  "/precache-manifest.c1b53d438ec5c3d8881c50f52e064c35.js"
 );
 
 self.addEventListener('message', (event) => {

src/components/video/index.js

 import React, { Component } from "react"
 import HeaderBar from "src/common/HeaderBar"
 import "./video.scss"
-import { NavLink, Route, Redirect, Switch } from "react-router-dom"
+import { NavLink, Route, Switch } from "react-router-dom"
 import { http, getParam, browser } from "src/utils"
 import Recommendation from "./recommendation"
 import VideoCatalog from "./video-catalog"
@@ -125,10 +125,11 @@ class Video extends Component {
   }
 
   componentDidMount() {
-    if (window.location.protocol === "https:") {
-      window.location.replace("http" + window.location.href.slice(5))
-      return
-    }
+    // 移除 HTTPS 到 HTTP 的强制转换，避免与服务器重定向形成循环
+    // if (window.location.protocol === "https:") {
+    //   window.location.replace("http" + window.location.href.slice(5))
+    //   return
+    // }
 
     this.courseID = getParam("id")
     if (!this.courseID) {