Merge branch 'dev' of https://gitee.com/playeduxyz/backend into dev

src/compenents/upload-video-button/index.tsx

@@ -81,7 +81,7 @@ export const UploadVideoButton = (props: PropsInterface) => {
           minioMergeVideo(
             item.filename,
             item.uploadId,
-            props.categoryIds.join(','),
+            props.categoryIds.join(","),
             item.name,
             "mp4",
             item.size,
@@ -119,6 +119,12 @@ export const UploadVideoButton = (props: PropsInterface) => {
     },
   };
 
+  const closeWin = () => {
+    setShowModal(false);
+    setFileList([]);
+    props.onUpdate();
+  };
+
   return (
     <>
       <Button
@@ -136,14 +142,12 @@ export const UploadVideoButton = (props: PropsInterface) => {
           title="上传视频"
           open={true}
           onCancel={() => {
-            setShowModal(false);
+            closeWin();
-            props.onUpdate();
           }}
           maskClosable={false}
           closable={false}
           onOk={() => {
-            setShowModal(false);
+            closeWin();
-            props.onUpdate();
           }}
         >
           <Row gutter={[0, 10]}>

src/routes/index.tsx

@@ -65,6 +65,9 @@ if (getToken()) {
     });
   });
 } else {
+  if (window.location.pathname !== "/login") {
+    window.location.href = "/login";
+  }
   RootPage = <InitPage loginData={null} />;
 }
 

src/types/index.d.ts

@@ -0,0 +1,8 @@
+declare global {
+  interface VideoParseInfo {
+    poster: string;
+    duration: number;
+  }
+}
+
+export {}

src/types/index.ts

@@ -1,4 +0,0 @@
-export interface VideoParseInfo {
-    poster:string;
-    duration:number;
-}

src/utils/index.ts

@@ -1,5 +1,4 @@
 import moment from "moment";
-import { VideoParseInfo } from "../types";
 
 export function getToken(): string {
   return window.localStorage.getItem("playedu-backend-token") || "";