From 19994b680cc1981a806ce749ee8f326b5e219d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 3 Jul 2023 14:16:13 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0pc=E9=87=91=E9=A2=9Dh5URl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system/config/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx
index 3d20988..4fce7e1 100644
--- a/src/pages/system/config/index.tsx
+++ b/src/pages/system/config/index.tsx
@@ -308,7 +308,7 @@ const SystemConfigPage = () => {
               placeholder="请填写网站页脚"
             />
           </Form.Item>
-          {/* 
+
           <Form.Item
             style={{ marginBottom: 30 }}
             label="PC端访问地址"
@@ -322,7 +322,7 @@ const SystemConfigPage = () => {
             name="system.h5_url"
           >
             <Input style={{ width: 274 }} placeholder="请填写H5端访问地址" />
-          </Form.Item> */}
+          </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
             wrapperCol={{ offset: 3, span: 21 }}

From e74856d5b00a651cb0bfcb5154a4426307d50da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 3 Jul 2023 15:50:17 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.ts          |  9 +-----
 src/pages/login/index.tsx | 63 ++-------------------------------------
 2 files changed, 3 insertions(+), 69 deletions(-)

diff --git a/src/api/login.ts b/src/api/login.ts
index 43e0290..66e7324 100644
--- a/src/api/login.ts
+++ b/src/api/login.ts
@@ -1,16 +1,9 @@
 import client from "./internal/httpClient";
 
-export function login(
-  email: string,
-  password: string,
-  captchaKey: string,
-  captchaVal: string
-) {
+export function login(email: string, password: string) {
   return client.post("/backend/v1/auth/login", {
     email: email,
     password: password,
-    captcha_key: captchaKey,
-    captcha_value: captchaVal,
   });
 }
 
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index f3fe4d7..a7eefb4 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import styles from "./index.module.less";
-import { Spin, Input, Button, message } from "antd";
+import { Input, Button, message } from "antd";
 import { login as loginApi, system } from "../../api/index";
 import { setToken } from "../../utils/index";
 import { useDispatch } from "react-redux";
@@ -18,22 +18,8 @@ const LoginPage = () => {
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const [loading, setLoading] = useState<boolean>(false);
-  const [image, setImage] = useState<string>("");
   const [email, setEmail] = useState<string>("");
   const [password, setPassword] = useState<string>("");
-  const [captchaVal, setCaptchaVal] = useState<string>("");
-  const [captchaKey, setCaptchaKey] = useState<string>("");
-  const [captchaLoading, setCaptchaLoading] = useState(true);
-
-  const fetchImageCaptcha = () => {
-    setCaptchaVal("");
-    setCaptchaLoading(true);
-    system.getImageCaptcha().then((res: any) => {
-      setImage(res.data.image);
-      setCaptchaKey(res.data.key);
-      setCaptchaLoading(false);
-    });
-  };
 
   const loginSubmit = async () => {
     if (!email) {
@@ -44,14 +30,6 @@ const LoginPage = () => {
       message.error("请输入密码");
       return;
     }
-    if (!captchaVal) {
-      message.error("请输入图形验证码");
-      return;
-    }
-    if (captchaVal.length !== 4) {
-      message.error("图形验证码错误");
-      return;
-    }
     await handleSubmit();
   };
 
@@ -61,12 +39,7 @@ const LoginPage = () => {
     }
     setLoading(true);
     try {
-      let res: any = await loginApi.login(
-        email,
-        password,
-        captchaKey,
-        captchaVal
-      );
+      let res: any = await loginApi.login(email, password);
       setToken(res.data.token); //将token写入本地
       await getSystemConfig(); //获取系统配置并写入store
       await getUser(); //获取登录用户的信息并写入store
@@ -75,7 +48,6 @@ const LoginPage = () => {
     } catch (e) {
       console.error("错误信息", e);
       setLoading(false);
-      fetchImageCaptcha(); //刷新图形验证码
     }
   };
 
@@ -104,10 +76,6 @@ const LoginPage = () => {
     }
   };
 
-  useEffect(() => {
-    fetchImageCaptcha();
-  }, []);
-
   return (
     <div className={styles["login-content"]}>
       <div className={styles["banner-box"]}>
@@ -142,33 +110,6 @@ const LoginPage = () => {
               placeholder="请输入密码"
             />
           </div>
-          <div className="d-flex mt-50">
-            <Input
-              value={captchaVal}
-              style={{ width: 260, height: 54 }}
-              placeholder="请输入图形验证码"
-              onChange={(e) => {
-                setCaptchaVal(e.target.value);
-              }}
-              allowClear
-              onKeyUp={(e) => keyUp(e)}
-            />
-            <div className={styles["captcha-box"]}>
-              {captchaLoading && (
-                <div className={styles["catpcha-loading-box"]}>
-                  <Spin size="small" />
-                </div>
-              )}
-
-              {!captchaLoading && (
-                <img
-                  className={styles["captcha"]}
-                  onClick={fetchImageCaptcha}
-                  src={image}
-                />
-              )}
-            </div>
-          </div>
           <div className="login-box d-flex mt-50">
             <Button
               style={{ width: 400, height: 54 }}

From 697315e7ae79a063100cf61ca0b013a3fab8bdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 3 Jul 2023 16:23:11 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.module.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/login/index.module.less b/src/pages/login/index.module.less
index 4b034a5..596cb1a 100644
--- a/src/pages/login/index.module.less
+++ b/src/pages/login/index.module.less
@@ -29,7 +29,7 @@
       width: 440px;
       height: 100%;
       box-sizing: border-box;
-      padding: 80px 10px 80px 30px;
+      padding: 90px 10px 80px 30px;
       .icon {
         width: 400px;
         height: 400px;
@@ -39,7 +39,7 @@
       width: 440px;
       height: 100%;
       box-sizing: border-box;
-      padding: 50px 30px;
+      padding: 90px 30px 50px 30px;
       display: flex;
       flex-direction: column;
 

From 728c2d5fd0252cac1dbd2ed5bfba449dacbc9fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 3 Jul 2023 16:39:24 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=88=E4=B8=8A=E8=AF=BE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=B7=BB=E5=8A=A0=E8=AF=BE=E6=97=B6=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/compenents/hour-update.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/course/compenents/hour-update.tsx b/src/pages/course/compenents/hour-update.tsx
index cf7529f..14d5f33 100644
--- a/src/pages/course/compenents/hour-update.tsx
+++ b/src/pages/course/compenents/hour-update.tsx
@@ -109,7 +109,7 @@ export const CourseHourUpdate: React.FC<PropInterface> = ({
       if (videos[i].disabled === false) {
         hours.push({
           chapter_id: 0,
-          sort: i,
+          sort: treeData.length + i,
           title: videos[i].name,
           type: videos[i].type,
           duration: videos[i].duration,
@@ -144,7 +144,7 @@ export const CourseHourUpdate: React.FC<PropInterface> = ({
       if (videos[i].disabled === false) {
         hours.push({
           chapter_id: data[addvideoCurrent].id,
-          sort: i,
+          sort: data[addvideoCurrent].hours.length + i,
           title: videos[i].name,
           type: videos[i].type,
           duration: videos[i].duration,

From d5f239c472ee7bfe8dbdf166538e2600ead929b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Mon, 3 Jul 2023 17:07:27 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/system/config/index.tsx | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx
index 4fce7e1..4e8dfbe 100644
--- a/src/pages/system/config/index.tsx
+++ b/src/pages/system/config/index.tsx
@@ -286,6 +286,20 @@ const SystemConfigPage = () => {
           >
             <Input style={{ width: 274 }} placeholder="请填写API访问地址" />
           </Form.Item>
+          <Form.Item
+            style={{ marginBottom: 30 }}
+            label="PC端访问地址"
+            name="system.pc_url"
+          >
+            <Input style={{ width: 274 }} placeholder="请填写PC端访问地址" />
+          </Form.Item>
+          <Form.Item
+            style={{ marginBottom: 30 }}
+            label="H5端访问地址"
+            name="system.h5_url"
+          >
+            <Input style={{ width: 274 }} placeholder="请填写H5端访问地址" />
+          </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
             label="网站标题"
@@ -308,21 +322,6 @@ const SystemConfigPage = () => {
               placeholder="请填写网站页脚"
             />
           </Form.Item>
-
-          <Form.Item
-            style={{ marginBottom: 30 }}
-            label="PC端访问地址"
-            name="system.pc_url"
-          >
-            <Input style={{ width: 274 }} placeholder="请填写PC端访问地址" />
-          </Form.Item>
-          <Form.Item
-            style={{ marginBottom: 30 }}
-            label="H5端访问地址"
-            name="system.h5_url"
-          >
-            <Input style={{ width: 274 }} placeholder="请填写H5端访问地址" />
-          </Form.Item>
           <Form.Item
             style={{ marginBottom: 30 }}
             wrapperCol={{ offset: 3, span: 21 }}

From 002a0b1272ba02def9789a220e49a65ebe8609b4 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Mon, 3 Jul 2023 20:50:14 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E7=9A=84=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?60s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/minio-upload-chunk.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/minio-upload-chunk.ts b/src/js/minio-upload-chunk.ts
index 8136efd..2698fec 100644
--- a/src/js/minio-upload-chunk.ts
+++ b/src/js/minio-upload-chunk.ts
@@ -19,7 +19,7 @@ export class UploadChunk {
 
   constructor(file: File, uploadId: string, filename: string) {
     this.client = axios.create({
-      timeout: 15000,
+      timeout: 60000,
       withCredentials: false,
     });
     this.file = file;