From 3af33c16e352e4dfa7d15311d5fff8233e9a5f8e Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 19 Aug 2024 17:11:16 +0800
Subject: [PATCH 01/40] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.h5/src/pages/login/login-error.module.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xyz.meedu.h5/src/pages/login/login-error.module.scss b/xyz.meedu.h5/src/pages/login/login-error.module.scss
index b0907c5eb..d25579187 100644
--- a/xyz.meedu.h5/src/pages/login/login-error.module.scss
+++ b/xyz.meedu.h5/src/pages/login/login-error.module.scss
@@ -11,12 +11,12 @@
     width: 64px;
     height: 64px;
     border-radius: 50%;
+    margin-bottom: 30px;
     img {
       width: 64px;
       height: 64px;
       border-radius: 50%;
     }
-    margin-bottom: 30px;
   }
   .text {
     height: 30px;

From 0e61e1496367fbd1efdceff9e980d547faff8ccf Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 9 Sep 2024 09:00:28 +0800
Subject: [PATCH 02/40] =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91=20&=20?=
 =?UTF-8?q?=E8=85=BE=E8=AE=AF=E4=BA=91=E7=9A=84=E8=A7=86=E9=A2=91=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E5=9C=B0=E5=9D=80=E7=BC=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA30=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/app/Exceptions/SystemException.php           | 2 +-
 xyz.meedu.api/app/Meedu/Cache/Impl/AliVodPlayCache.php     | 2 +-
 xyz.meedu.api/app/Meedu/Cache/Impl/TencentVodPlayCache.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xyz.meedu.api/app/Exceptions/SystemException.php b/xyz.meedu.api/app/Exceptions/SystemException.php
index 505ea72ea..60a337d74 100644
--- a/xyz.meedu.api/app/Exceptions/SystemException.php
+++ b/xyz.meedu.api/app/Exceptions/SystemException.php
@@ -24,6 +24,6 @@ public function render()
         if (request()->wantsJson()) {
             return $this->error(__('错误'));
         }
-        abort(500, $this->getMessage());
+        abort(500, __('错误'));
     }
 }
diff --git a/xyz.meedu.api/app/Meedu/Cache/Impl/AliVodPlayCache.php b/xyz.meedu.api/app/Meedu/Cache/Impl/AliVodPlayCache.php
index e6c4da746..ff06262e0 100644
--- a/xyz.meedu.api/app/Meedu/Cache/Impl/AliVodPlayCache.php
+++ b/xyz.meedu.api/app/Meedu/Cache/Impl/AliVodPlayCache.php
@@ -22,7 +22,7 @@ class AliVodPlayCache
     private $previewSeconds;
 
     public const CACHE_NAME_TPL = 'ali:vod:play:%s:%d:%d';
-    public const CACHE_EXPIRE = 10800;
+    public const CACHE_EXPIRE = 1800;
 
     public function __construct(int $id, string $videoId, int $previewSeconds = 0)
     {
diff --git a/xyz.meedu.api/app/Meedu/Cache/Impl/TencentVodPlayCache.php b/xyz.meedu.api/app/Meedu/Cache/Impl/TencentVodPlayCache.php
index ac258eb8f..fddbc988a 100644
--- a/xyz.meedu.api/app/Meedu/Cache/Impl/TencentVodPlayCache.php
+++ b/xyz.meedu.api/app/Meedu/Cache/Impl/TencentVodPlayCache.php
@@ -22,7 +22,7 @@ class TencentVodPlayCache
     private $previewSeconds;
 
     public const CACHE_NAME_TPL = 'tencent:vod:play:%s:%d';
-    public const CACHE_EXPIRE = 10800;
+    public const CACHE_EXPIRE = 1800;
 
     public function __construct(int $id, string $videoId, int $previewSeconds = 0)
     {

From b421c879c0d8648ac8ee98da53187f587bd93a2a Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 09:31:14 +0800
Subject: [PATCH 03/40] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E3=80=81=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/system/config/mp_wechatConfig.tsx   | 43 +------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

diff --git a/xyz.meedu.admin/src/pages/system/config/mp_wechatConfig.tsx b/xyz.meedu.admin/src/pages/system/config/mp_wechatConfig.tsx
index b01093a47..e51deaf28 100644
--- a/xyz.meedu.admin/src/pages/system/config/mp_wechatConfig.tsx
+++ b/xyz.meedu.admin/src/pages/system/config/mp_wechatConfig.tsx
@@ -59,20 +59,6 @@ const SystemMpWechatConfigPage = () => {
                 configData[index].value
               ),
             });
-          } else if (
-            configData[index].key === "meedu.mp_wechat.enabled_scan_login"
-          ) {
-            form.setFieldsValue({
-              "meedu.mp_wechat.enabled_scan_login": Number(
-                configData[index].value
-              ),
-            });
-          } else if (
-            configData[index].key === "meedu.mp_wechat.scan_login_alert"
-          ) {
-            form.setFieldsValue({
-              "meedu.mp_wechat.scan_login_alert": configData[index].value,
-            });
           } else if (
             configData[index].key === "meedu.mp_wechat.enabled_share"
           ) {
@@ -142,14 +128,6 @@ const SystemMpWechatConfigPage = () => {
     }
   };
 
-  const scanLoginChange = (checked: boolean) => {
-    if (checked) {
-      form.setFieldsValue({ "meedu.mp_wechat.enabled_scan_login": 1 });
-    } else {
-      form.setFieldsValue({ "meedu.mp_wechat.enabled_scan_login": 0 });
-    }
-  };
-
   const wechatShareChange = (checked: boolean) => {
     if (checked) {
       form.setFieldsValue({ "meedu.mp_wechat.enabled_share": 1 });
@@ -206,31 +184,12 @@ const SystemMpWechatConfigPage = () => {
             </Form.Item>
             <div className="from-title mt-30">登录配置</div>
             <Form.Item
-              label="启用授权登录"
+              label="启用微信登录"
               name="meedu.mp_wechat.enabled_oauth_login"
               valuePropName="checked"
             >
               <Switch onChange={oauthLoginChange} />
             </Form.Item>
-            <Form.Item
-              label="启用PC扫码登录"
-              name="meedu.mp_wechat.enabled_scan_login"
-              valuePropName="checked"
-            >
-              <Switch onChange={scanLoginChange} />
-            </Form.Item>
-            <Form.Item
-              label="扫码登录成功回复信息"
-              name="meedu.mp_wechat.scan_login_alert"
-            >
-              <Input.TextArea
-                rows={6}
-                style={{ width: 400, resize: "none" }}
-                allowClear
-                showCount
-                maxLength={200}
-              />
-            </Form.Item>
             <div className="from-title mt-30">手机端分享</div>
             <Form.Item
               label="启用微信分享"

From 28a3d53056312c875fbd302167074951d50aa8d9 Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 09:32:23 +0800
Subject: [PATCH 04/40] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E3=80=81=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=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/mp_wechatConfig.tsx            | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/xyz.meedu.admin/src/pages/system/config/mp_wechatConfig.tsx b/xyz.meedu.admin/src/pages/system/config/mp_wechatConfig.tsx
index e51deaf28..ffb26e51f 100644
--- a/xyz.meedu.admin/src/pages/system/config/mp_wechatConfig.tsx
+++ b/xyz.meedu.admin/src/pages/system/config/mp_wechatConfig.tsx
@@ -166,12 +166,7 @@ const SystemMpWechatConfigPage = () => {
           >
             <div className="from-title mt-30">基础配置</div>
             <Form.Item label="AppId" name="meedu.mp_wechat.app_id">
-              <Form.Item name="meedu.mp_wechat.app_id">
-                <Input style={{ width: 300 }} allowClear />
-              </Form.Item>
-              <div className="form-helper-text">
-                <span>{webUrl}</span>
-              </div>
+              <Input style={{ width: 300 }} allowClear />
             </Form.Item>
             <Form.Item label="AppSecret" name="meedu.mp_wechat.app_secret">
               <Input style={{ width: 300 }} allowClear />

From eceb9986cd1f48a610378ade5291f4a6ce4c720a Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 10:09:33 +0800
Subject: [PATCH 05/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.pc/src/api/user.ts                  |  6 +-
 .../src/components/login-dailog/index.tsx     |  4 +-
 .../components/weixin-login-dailog/index.tsx  | 64 +++++++++++--------
 xyz.meedu.pc/src/meedu.d.ts                   |  1 -
 xyz.meedu.pc/src/pages/member/index.tsx       |  2 +-
 5 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/xyz.meedu.pc/src/api/user.ts b/xyz.meedu.pc/src/api/user.ts
index 714fa6aa3..2e504a443 100644
--- a/xyz.meedu.pc/src/api/user.ts
+++ b/xyz.meedu.pc/src/api/user.ts
@@ -20,13 +20,13 @@ export function courses(depId: number) {
 }
 
 //微信登录二维码获取
-export function wechatLogin() {
-  return client.get("/api/v3/auth/login/wechat/scan", {});
+export function wechatLogin(params: any) {
+  return client.post("/api/v3/auth/login/wechat-scan/url", params);
 }
 
 //检测微信二维码登录
 export function checkWechatLogin(params: any) {
-  return client.get("/api/v3/auth/login/wechat/scan/query", params);
+  return client.get("/api/v3/auth/login/wechat-scan/query", params);
 }
 
 //微信登登录后绑定手机号
diff --git a/xyz.meedu.pc/src/components/login-dailog/index.tsx b/xyz.meedu.pc/src/components/login-dailog/index.tsx
index ce4c09496..eef8c9f40 100644
--- a/xyz.meedu.pc/src/components/login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/login-dailog/index.tsx
@@ -413,7 +413,7 @@ export const LoginDialog: React.FC<PropInterface> = ({
               </div>
             )}
             {(config.socialites.qq === 1 ||
-              config.socialites.wechat_scan === 1) && (
+              config.socialites.wechat_oauth === 1) && (
               <div className={styles["others"]}>
                 <div className={styles["tit"]}>第三方快捷登录</div>
                 <div className={styles["tab-icon"]}>
@@ -427,7 +427,7 @@ export const LoginDialog: React.FC<PropInterface> = ({
                       src={iconQQ}
                     />
                   )}
-                  {config.socialites.wechat_scan === 1 && (
+                  {config.socialites.wechat_oauth === 1 && (
                     <img
                       onClick={() => {
                         interval && clearInterval(interval);
diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index d0df44e7b..4df3e72a5 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -2,9 +2,9 @@ import React, { useState, useEffect } from "react";
 import { useDispatch } from "react-redux";
 import { useParams, useNavigate, useLocation } from "react-router-dom";
 import styles from "./index.module.scss";
-import { Modal, Image, QRCode } from "antd";
-import { user } from "../../api/index";
-import { setToken, saveLoginCode } from "../../utils/index";
+import { Modal, QRCode } from "antd";
+import { user, login } from "../../api/index";
+import { setToken, saveLoginCode, getMsv } from "../../utils/index";
 import { loginAction } from "../../store/user/loginUserSlice";
 
 interface PropInterface {
@@ -30,6 +30,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
   const [loading, setLoading] = useState(false);
   const [qrode, setQrode] = useState("");
   const [code, setCode] = useState("");
+  const [key, setKey] = useState("");
   const [redirect, setRedirect] = useState(result.get("redirect"));
 
   useEffect(() => {
@@ -46,32 +47,37 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
       return;
     }
     setLoading(true);
-    user.wechatLogin().then((res: any) => {
-      setQrode(res.data.image);
-      setCode(res.data.code);
-      timer = setInterval(() => checkWechatLogin(res.data.code), 1000);
+    user.wechatLogin({ action: "login" }).then((res: any) => {
+      setQrode(res.data.url);
+      setKey(res.data.key);
+      timer = setInterval(() => checkWechatLogin(res.data.key), 1000);
       setLoading(false);
     });
   };
 
   const checkWechatLogin = (value: any) => {
-    user.checkWechatLogin({ code: value }).then((res: any) => {
-      if (res.data.success === 1 && res.data.token) {
-        let token = res.data.token;
-        setToken(token);
-        user.detail().then((res: any) => {
-          let loginData = res.data;
-          dispatch(loginAction(loginData));
-          redirectHandler();
-        });
-      } else if (
-        res.data.success === 0 &&
-        res.data.code &&
-        res.data.action === "bind_mobile"
-      ) {
-        timer && clearInterval(timer);
-        saveLoginCode(res.data.code);
-        bindMobile();
+    user.checkWechatLogin({ key: value }).then((res: any) => {
+      if (res.data.code && res.data.code !== "0") {
+        login
+          .codeLogin({ code: res.data.code, msv: getMsv() })
+          .then((res: any) => {
+            if (res.data.success === 1) {
+              setToken(res.data.token);
+              user.detail().then((res: any) => {
+                let loginData = res.data;
+                // 将学员数据存储到store
+                dispatch(loginAction(loginData));
+                // 登录成功之后的跳转
+                redirectHandler();
+              });
+            } else {
+              if (res.data.action === "bind_mobile") {
+                timer && clearInterval(timer);
+                saveLoginCode(res.data.code);
+                bindMobile();
+              }
+            }
+          });
       }
     });
   };
@@ -119,10 +125,12 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
             </a>
           </div>
           <div className={styles["box"]}>
-            {loading ? (
-              <QRCode value="loading" size={300} status="loading" />
-            ) : (
-              <Image width={300} height={300} src={qrode} preview={false} />
+            {qrode !== "" && (
+              <QRCode
+                value={qrode}
+                size={300}
+                status={loading ? "loading" : "active"}
+              />
             )}
           </div>
         </Modal>
diff --git a/xyz.meedu.pc/src/meedu.d.ts b/xyz.meedu.pc/src/meedu.d.ts
index 0060d6c86..5886c1f7e 100644
--- a/xyz.meedu.pc/src/meedu.d.ts
+++ b/xyz.meedu.pc/src/meedu.d.ts
@@ -44,7 +44,6 @@ declare global {
     };
     socialites: {
       qq: number;
-      wechat_scan: number;
       wechat_oauth: number;
     };
     url: string;
diff --git a/xyz.meedu.pc/src/pages/member/index.tsx b/xyz.meedu.pc/src/pages/member/index.tsx
index 9b8184d29..1dd461a84 100644
--- a/xyz.meedu.pc/src/pages/member/index.tsx
+++ b/xyz.meedu.pc/src/pages/member/index.tsx
@@ -511,7 +511,7 @@ const MemberPage = () => {
                   </div>
                 )}
 
-                {systemConfig.socialites.wechat_scan === 1 && (
+                {systemConfig.socialites.wechat_oauth === 1 && (
                   <div className={styles["item-line"]}>
                     <div className={styles["item-left"]}>
                       <div className={styles["item-name"]}>

From 95fe01fdd22bddb968fea61619428248add9d9dd Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 10:40:11 +0800
Subject: [PATCH 06/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin-login-dailog/index.module.scss     |  3 +
 .../components/weixin-login-dailog/index.tsx  | 85 +++++++++++++++++--
 2 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss b/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
index 8be93c5aa..66ac7cb68 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
@@ -61,4 +61,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  .time {
+    margin-bottom: 16px;
+  }
 }
diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 4df3e72a5..16bddec55 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -15,6 +15,7 @@ interface PropInterface {
 }
 
 var timer: any = null;
+var countTimer: any = null;
 
 export const WeixinLoginDialog: React.FC<PropInterface> = ({
   open,
@@ -29,8 +30,14 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
   const pathname = useLocation().pathname;
   const [loading, setLoading] = useState(false);
   const [qrode, setQrode] = useState("");
-  const [code, setCode] = useState("");
   const [key, setKey] = useState("");
+  const [expired, setExpired] = useState(false);
+  const [remainingTime, setRemainingTime] = useState<any>({
+    day: 0,
+    hr: 0,
+    min: 0,
+    sec: 0,
+  });
   const [redirect, setRedirect] = useState(result.get("redirect"));
 
   useEffect(() => {
@@ -39,6 +46,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     }
     return () => {
       timer && clearInterval(timer);
+      countTimer && clearInterval(countTimer);
     };
   }, [open]);
 
@@ -50,6 +58,8 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     user.wechatLogin({ action: "login" }).then((res: any) => {
       setQrode(res.data.url);
       setKey(res.data.key);
+      setExpired(false);
+      countdown(res.data.expire);
       timer = setInterval(() => checkWechatLogin(res.data.key), 1000);
       setLoading(false);
     });
@@ -96,6 +106,37 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     }
   };
 
+  const countdown = (timestamp: number) => {
+    const today: any = new Date();
+    const now = Date.parse(today);
+    let remaining: number = timestamp - now / 1000;
+    if (remaining <= 0) {
+      countTimer && clearInterval(countTimer);
+      setExpired(true);
+      return;
+    }
+    countTimer = setInterval(() => {
+      //防止出现负数
+      if (remaining > 0) {
+        remaining--;
+        let day = Math.floor(remaining / 3600 / 24);
+        let hour = Math.floor((remaining / 3600) % 24);
+        let minute = Math.floor((remaining / 60) % 60);
+        let second = Math.floor(remaining % 60);
+
+        setRemainingTime({
+          day: day,
+          hr: hour < 10 ? "0" + hour : hour,
+          min: minute < 10 ? "0" + minute : minute,
+          sec: second < 10 ? "0" + second : second,
+        });
+      } else {
+        countTimer && clearInterval(countTimer);
+        setExpired(true);
+      }
+    }, 1000);
+  };
+
   return (
     <>
       {open ? (
@@ -125,12 +166,44 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
             </a>
           </div>
           <div className={styles["box"]}>
+            <div className={styles["time"]}>
+              有效期：
+              {remainingTime.day !== 0 && (
+                <span>
+                  {remainingTime.day}天{remainingTime.hr}时{remainingTime.min}分
+                  {remainingTime.sec}秒
+                </span>
+              )}
+              {remainingTime.day === 0 && remainingTime.hr !== "00" && (
+                <span>
+                  {remainingTime.hr}时{remainingTime.min}分{remainingTime.sec}秒
+                </span>
+              )}
+              {remainingTime.day === 0 && remainingTime.hr === "00" && (
+                <span>
+                  {remainingTime.min}分{remainingTime.sec}秒
+                </span>
+              )}
+            </div>
             {qrode !== "" && (
-              <QRCode
-                value={qrode}
-                size={300}
-                status={loading ? "loading" : "active"}
-              />
+              <>
+                {expired ? (
+                  <QRCode
+                    value={qrode}
+                    size={300}
+                    status="expired"
+                    onRefresh={() => {
+                      getQrode();
+                    }}
+                  />
+                ) : (
+                  <QRCode
+                    value={qrode}
+                    size={300}
+                    status={loading ? "loading" : "active"}
+                  />
+                )}
+              </>
             )}
           </div>
         </Modal>

From 0dc3f3c873ab008fa2a450d26dc4ea0fd8ed258d Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 10:50:21 +0800
Subject: [PATCH 07/40] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E8=87=AA=E5=8A=A8=E5=9B=9E=E5=A4=8D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AD=89=E9=A1=B5=E9=9D=A2=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/left-menu/index.tsx        |  10 +-
 .../src/pages/wechat/components/create.tsx    | 171 -----
 .../src/pages/wechat/components/update.tsx    | 193 -----
 xyz.meedu.admin/src/pages/wechat/create.tsx   | 169 -----
 xyz.meedu.admin/src/pages/wechat/index.tsx    | 259 -------
 .../src/pages/wechat/mp-wechat-menu/index.tsx | 660 ------------------
 xyz.meedu.admin/src/pages/wechat/update.tsx   | 204 ------
 xyz.meedu.admin/src/routes/index.tsx          |  23 -
 8 files changed, 1 insertion(+), 1688 deletions(-)
 delete mode 100644 xyz.meedu.admin/src/pages/wechat/components/create.tsx
 delete mode 100644 xyz.meedu.admin/src/pages/wechat/components/update.tsx
 delete mode 100644 xyz.meedu.admin/src/pages/wechat/create.tsx
 delete mode 100644 xyz.meedu.admin/src/pages/wechat/index.tsx
 delete mode 100644 xyz.meedu.admin/src/pages/wechat/mp-wechat-menu/index.tsx
 delete mode 100644 xyz.meedu.admin/src/pages/wechat/update.tsx

diff --git a/xyz.meedu.admin/src/components/left-menu/index.tsx b/xyz.meedu.admin/src/components/left-menu/index.tsx
index 08259577f..535ed02d0 100644
--- a/xyz.meedu.admin/src/components/left-menu/index.tsx
+++ b/xyz.meedu.admin/src/components/left-menu/index.tsx
@@ -99,14 +99,6 @@ const items = [
     [
       getItem("VIP会员", "/role", null, null, null, "role"),
       getItem("优惠码", "/promocode", null, null, null, "promoCode"),
-      getItem(
-        "公众号",
-        "/wechat/messagereply/index",
-        null,
-        null,
-        null,
-        "mpWechatMessageReply"
-      ),
     ],
     null,
     null
@@ -243,7 +235,7 @@ export const LeftMenu: React.FC = () => {
     } else if (location.pathname.indexOf("/member/") !== -1) {
       setSelectedKeys(["/member/index"]);
       setOpenKeys(openKeyMerge("/member"));
-    }else if (location.pathname.indexOf("/order/code-import") !== -1) {
+    } else if (location.pathname.indexOf("/order/code-import") !== -1) {
       setSelectedKeys(["/promocode"]);
       setOpenKeys(openKeyMerge("/promocode"));
     } else if (location.pathname.indexOf("/order/recharge") !== -1) {
diff --git a/xyz.meedu.admin/src/pages/wechat/components/create.tsx b/xyz.meedu.admin/src/pages/wechat/components/create.tsx
deleted file mode 100644
index 0b48dcbc2..000000000
--- a/xyz.meedu.admin/src/pages/wechat/components/create.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import { useEffect, useState } from "react";
-import { Modal, Form, Input, message, Select, Space } from "antd";
-import { HelperText } from "../../../components";
-import { wechat } from "../../../api/index";
-
-interface PropsInterface {
-  open: boolean;
-  onCancel: () => void;
-  onSuccess: () => void;
-}
-
-export const WechatCreateDialog = (props: PropsInterface) => {
-  const [form] = Form.useForm();
-  const [loading, setLoading] = useState<boolean>(false);
-  const [types, setTypes] = useState<any>([]);
-  const [type, setType] = useState<string>("");
-  const events = [
-    {
-      value: "subscribe",
-      label: "用户关注",
-    },
-    {
-      value: "CLICK",
-      label: "自定义菜单事件",
-    },
-  ];
-
-  const getParams = () => {
-    wechat.create().then((res: any) => {
-      const arr = [];
-      let types = res.data.types;
-      for (let i = 0; i < types.length; i++) {
-        arr.push({
-          label: types[i].name,
-          value: types[i].id,
-        });
-      }
-      setTypes(arr);
-    });
-  };
-
-  useEffect(() => {
-    if (props.open) {
-      getParams();
-      form.setFieldsValue({
-        rule: "",
-        type: undefined,
-        event_type: undefined,
-        event_key: undefined,
-        reply_content: "",
-      });
-    }
-  }, [props.open]);
-
-  const onFinish = (values: any) => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    wechat
-      .store(values)
-      .then((res: any) => {
-        setLoading(false);
-        message.success("成功！");
-        props.onSuccess();
-      })
-      .catch((e) => {
-        setLoading(false);
-      });
-  };
-
-  const onFinishFailed = (errorInfo: any) => {
-    console.log("Failed:", errorInfo);
-  };
-
-  return (
-    <>
-      {props.open ? (
-        <Modal
-          title="新建自动回复"
-          onCancel={() => {
-            props.onCancel();
-          }}
-          open={true}
-          width={800}
-          maskClosable={false}
-          onOk={() => {
-            form.submit();
-          }}
-          centered
-        >
-          <div className="float-left mt-30">
-            <Form
-              form={form}
-              name="wechat-create-dailog"
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 21 }}
-              initialValues={{ remember: true }}
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
-              autoComplete="off"
-            >
-              <Form.Item
-                label="消息类型"
-                name="type"
-                rules={[{ required: true, message: "请选择消息类型!" }]}
-              >
-                <Select
-                  style={{ width: 300 }}
-                  allowClear
-                  placeholder="请选择消息类型"
-                  options={types}
-                  onChange={(e) => {
-                    setType(e);
-                  }}
-                />
-              </Form.Item>
-              {type === "text" && (
-                <Form.Item label="触发关键字">
-                  <Space align="baseline" style={{ height: 32 }}>
-                    <Form.Item name="rule">
-                      <Input
-                        style={{ width: 300 }}
-                        placeholder="请输入触发关键字"
-                        allowClear
-                      />
-                    </Form.Item>
-                    <div className="ml-10">
-                      <HelperText text="支持正则表达式"></HelperText>
-                    </div>
-                  </Space>
-                </Form.Item>
-              )}
-              {type === "event" && (
-                <>
-                  <Form.Item label="事件" name="event_type">
-                    <Select
-                      style={{ width: 300 }}
-                      allowClear
-                      placeholder="请选择事件"
-                      options={events}
-                    />
-                  </Form.Item>
-                  <Form.Item label="事件key" name="event_key">
-                    <Input
-                      style={{ width: 300 }}
-                      allowClear
-                      placeholder="请输入事件key"
-                    />
-                  </Form.Item>
-                </>
-              )}
-              <Form.Item
-                label="回复内容"
-                name="reply_content"
-                rules={[{ required: true, message: "请输入回复内容!" }]}
-              >
-                <Input.TextArea
-                  style={{ width: 500, minHeight: 120 }}
-                  placeholder="请输入回复内容"
-                  allowClear
-                  maxLength={200}
-                />
-              </Form.Item>
-            </Form>
-          </div>
-        </Modal>
-      ) : null}
-    </>
-  );
-};
diff --git a/xyz.meedu.admin/src/pages/wechat/components/update.tsx b/xyz.meedu.admin/src/pages/wechat/components/update.tsx
deleted file mode 100644
index e63a1a589..000000000
--- a/xyz.meedu.admin/src/pages/wechat/components/update.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import { useEffect, useState } from "react";
-import { Modal, Form, Input, message, Select, Space, Spin } from "antd";
-import { HelperText } from "../../../components";
-import { wechat } from "../../../api/index";
-
-interface PropsInterface {
-  open: boolean;
-  id: number;
-  onCancel: () => void;
-  onSuccess: () => void;
-}
-
-export const WechatUpdateDialog = (props: PropsInterface) => {
-  const [form] = Form.useForm();
-  const [init, setInit] = useState<boolean>(true);
-  const [loading, setLoading] = useState<boolean>(false);
-  const [types, setTypes] = useState<any>([]);
-  const [type, setType] = useState<string>("");
-  const events = [
-    {
-      value: "subscribe",
-      label: "用户关注",
-    },
-    {
-      value: "CLICK",
-      label: "自定义菜单事件",
-    },
-  ];
-
-  const getParams = async () => {
-    const res: any = await wechat.create();
-    const arr = [];
-    let types = res.data.types;
-    for (let i = 0; i < types.length; i++) {
-      arr.push({
-        label: types[i].name,
-        value: types[i].id,
-      });
-    }
-    setTypes(arr);
-  };
-
-  useEffect(() => {
-    if (props.open && props.id > 0) {
-      setInit(true);
-      initData();
-    }
-  }, [props.open, props.id]);
-
-  const initData = async () => {
-    await getParams();
-    await getDetail();
-    setInit(false);
-  };
-
-  const getDetail = async () => {
-    const res: any = await wechat.detail(props.id);
-    var data = res.data.data;
-    setType(data.type);
-    form.setFieldsValue({
-      reply_content: data.reply_content,
-      event_key: data.event_key,
-      rule: data.rule,
-      event_type: data.event_type,
-      type: data.type,
-    });
-  };
-
-  const onFinish = (values: any) => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    wechat
-      .update(props.id, values)
-      .then((res: any) => {
-        setLoading(false);
-        message.success("成功！");
-        props.onSuccess();
-      })
-      .catch((e) => {
-        setLoading(false);
-      });
-  };
-
-  const onFinishFailed = (errorInfo: any) => {
-    console.log("Failed:", errorInfo);
-  };
-
-  return (
-    <>
-      {props.open ? (
-        <Modal
-          title="编辑自动回复"
-          onCancel={() => {
-            props.onCancel();
-          }}
-          open={true}
-          width={800}
-          maskClosable={false}
-          onOk={() => {
-            form.submit();
-          }}
-          centered
-        >
-          {init && (
-            <div className="float-left text-center mt-30">
-              <Spin></Spin>
-            </div>
-          )}
-          <div
-            style={{ display: init ? "none" : "block" }}
-            className="float-left mt-30"
-          >
-            <Form
-              form={form}
-              name="wechat-update-dailog"
-              labelCol={{ span: 3 }}
-              wrapperCol={{ span: 21 }}
-              initialValues={{ remember: true }}
-              onFinish={onFinish}
-              onFinishFailed={onFinishFailed}
-              autoComplete="off"
-            >
-              <Form.Item
-                label="消息类型"
-                name="type"
-                rules={[{ required: true, message: "请选择消息类型!" }]}
-              >
-                <Select
-                  style={{ width: 300 }}
-                  allowClear
-                  placeholder="请选择消息类型"
-                  options={types}
-                  onChange={(e) => {
-                    setType(e);
-                  }}
-                />
-              </Form.Item>
-              {type === "text" && (
-                <Form.Item label="触发关键字">
-                  <Space align="baseline" style={{ height: 32 }}>
-                    <Form.Item name="rule">
-                      <Input
-                        style={{ width: 300 }}
-                        placeholder="请输入触发关键字"
-                        allowClear
-                      />
-                    </Form.Item>
-                    <div className="ml-10">
-                      <HelperText text="支持正则表达式"></HelperText>
-                    </div>
-                  </Space>
-                </Form.Item>
-              )}
-              {type === "event" && (
-                <>
-                  <Form.Item label="事件" name="event_type">
-                    <Select
-                      style={{ width: 300 }}
-                      allowClear
-                      placeholder="请选择事件"
-                      options={events}
-                    />
-                  </Form.Item>
-                  <Form.Item label="事件key" name="event_key">
-                    <Input
-                      style={{ width: 300 }}
-                      allowClear
-                      placeholder="请输入事件key"
-                    />
-                  </Form.Item>
-                </>
-              )}
-              <Form.Item
-                label="回复内容"
-                name="reply_content"
-                rules={[{ required: true, message: "请输入回复内容!" }]}
-              >
-                <Input.TextArea
-                  style={{ width: 500, minHeight: 120 }}
-                  placeholder="请输入回复内容"
-                  allowClear
-                  maxLength={200}
-                />
-              </Form.Item>
-            </Form>
-          </div>
-        </Modal>
-      ) : null}
-    </>
-  );
-};
diff --git a/xyz.meedu.admin/src/pages/wechat/create.tsx b/xyz.meedu.admin/src/pages/wechat/create.tsx
deleted file mode 100644
index bf3fe97bb..000000000
--- a/xyz.meedu.admin/src/pages/wechat/create.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-import { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
-import { Button, Input, message, Form, Space, Select } from "antd";
-import { wechat } from "../../api/index";
-import { useDispatch } from "react-redux";
-import { titleAction } from "../../store/user/loginUserSlice";
-import { BackBartment, HelperText } from "../../components";
-
-const WechatCreatePage = () => {
-  const [form] = Form.useForm();
-  const dispatch = useDispatch();
-  const navigate = useNavigate();
-  const [loading, setLoading] = useState<boolean>(false);
-  const [types, setTypes] = useState<any>([]);
-  const [type, setType] = useState<string>("");
-  const events = [
-    {
-      value: "subscribe",
-      label: "用户关注",
-    },
-    {
-      value: "CLICK",
-      label: "自定义菜单事件",
-    },
-  ];
-
-  useEffect(() => {
-    document.title = "新建自动回复";
-    dispatch(titleAction("新建自动回复"));
-    getParams();
-  }, []);
-
-  const getParams = () => {
-    wechat.create().then((res: any) => {
-      const arr = [];
-      let types = res.data.types;
-      for (let i = 0; i < types.length; i++) {
-        arr.push({
-          label: types[i].name,
-          value: types[i].id,
-        });
-      }
-      setTypes(arr);
-    });
-  };
-
-  const onFinish = (values: any) => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    wechat
-      .store(values)
-      .then((res: any) => {
-        setLoading(false);
-        message.success("保存成功！");
-        navigate(-1);
-      })
-      .catch((e) => {
-        setLoading(false);
-      });
-  };
-
-  const onFinishFailed = (errorInfo: any) => {
-    console.log("Failed:", errorInfo);
-  };
-
-
-  return (
-    <div className="meedu-main-body">
-      <BackBartment title="新建自动回复" />
-      <div className="float-left mt-30">
-        <Form
-          form={form}
-          name="wechat-create"
-          labelCol={{ span: 3 }}
-          wrapperCol={{ span: 21 }}
-          initialValues={{ remember: true }}
-          onFinish={onFinish}
-          onFinishFailed={onFinishFailed}
-          autoComplete="off"
-        >
-          <Form.Item
-            label="消息类型"
-            name="type"
-            rules={[{ required: true, message: "请选择消息类型!" }]}
-          >
-            <Select
-              style={{ width: 300 }}
-              allowClear
-              placeholder="请选择消息类型"
-              options={types}
-              onChange={(e) => {
-                setType(e);
-              }}
-            />
-          </Form.Item>
-          {type === "text" && (
-            <Form.Item label="触发关键字">
-              <Space align="baseline" style={{ height: 32 }}>
-                <Form.Item name="rule">
-                  <Input
-                    style={{ width: 300 }}
-                    placeholder="请输入触发关键字"
-                    allowClear
-                  />
-                </Form.Item>
-                <div className="ml-10">
-                  <HelperText text="支持正则表达式"></HelperText>
-                </div>
-              </Space>
-            </Form.Item>
-          )}
-          {type === "event" && (
-            <>
-              <Form.Item label="事件" name="event_type">
-                <Select
-                  style={{ width: 300 }}
-                  allowClear
-                  placeholder="请选择事件"
-                  options={events}
-                />
-              </Form.Item>
-              <Form.Item label="事件key" name="event_key">
-                <Input
-                  style={{ width: 300 }}
-                  allowClear
-                  placeholder="请输入事件key"
-                />
-              </Form.Item>
-            </>
-          )}
-          <Form.Item
-            label="回复内容"
-            name="reply_content"
-            rules={[{ required: true, message: "请输入回复内容!" }]}
-          >
-            <Input.TextArea
-              style={{ width: 500, minHeight: 120 }}
-              placeholder="请输入回复内容"
-              allowClear
-              maxLength={200}
-            />
-          </Form.Item>
-        </Form>
-      </div>
-      <div className="bottom-menus">
-        <div className="bottom-menus-box">
-          <div>
-            <Button
-              loading={loading}
-              type="primary"
-              onClick={() => form.submit()}
-            >
-              保存
-            </Button>
-          </div>
-          <div className="ml-24">
-            <Button type="default" onClick={() => navigate(-1)}>
-              取消
-            </Button>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default WechatCreatePage;
diff --git a/xyz.meedu.admin/src/pages/wechat/index.tsx b/xyz.meedu.admin/src/pages/wechat/index.tsx
deleted file mode 100644
index 1433f5e31..000000000
--- a/xyz.meedu.admin/src/pages/wechat/index.tsx
+++ /dev/null
@@ -1,259 +0,0 @@
-import { useState, useEffect } from "react";
-import { Table, Modal, message, Space } from "antd";
-import { useNavigate, useSearchParams } from "react-router-dom";
-import type { ColumnsType } from "antd/es/table";
-import { useDispatch } from "react-redux";
-import { wechat } from "../../api/index";
-import { titleAction } from "../../store/user/loginUserSlice";
-import { PerButton, OptionBar } from "../../components";
-import { ExclamationCircleFilled } from "@ant-design/icons";
-import { WechatCreateDialog } from "./components/create";
-import { WechatUpdateDialog } from "./components/update";
-const { confirm } = Modal;
-
-interface DataType {
-  id: React.Key;
-  reply_content: string;
-}
-
-interface LocalSearchParamsInterface {
-  page?: number;
-  size?: number;
-}
-
-const WechatPage = () => {
-  const dispatch = useDispatch();
-  const navigate = useNavigate();
-  const [searchParams, setSearchParams] = useSearchParams({
-    page: "1",
-    size: "10",
-  });
-  const page = parseInt(searchParams.get("page") || "1");
-  const size = parseInt(searchParams.get("size") || "10");
-
-  const [loading, setLoading] = useState<boolean>(false);
-  const [list, setList] = useState<any>([]);
-  const [total, setTotal] = useState(0);
-  const [refresh, setRefresh] = useState(false);
-  const [showAddWin, setShowAddWin] = useState<boolean>(false);
-  const [showUpdateWin, setShowUpdateWin] = useState<boolean>(false);
-  const [updateId, setUpdateId] = useState<number>(0);
-
-  useEffect(() => {
-    document.title = "公众号";
-    dispatch(titleAction("公众号"));
-  }, []);
-
-  useEffect(() => {
-    getData();
-  }, [page, size, refresh]);
-
-  const getData = () => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    wechat
-      .list()
-      .then((res: any) => {
-        setList(res.data.data.data);
-        setTotal(res.data.data.total);
-        setLoading(false);
-      })
-      .catch((e) => {
-        setLoading(false);
-      });
-  };
-
-  const resetLocalSearchParams = (params: LocalSearchParamsInterface) => {
-    setSearchParams(
-      (prev) => {
-        if (typeof params.page !== "undefined") {
-          prev.set("page", params.page + "");
-        }
-        if (typeof params.size !== "undefined") {
-          prev.set("size", params.size + "");
-        }
-        return prev;
-      },
-      { replace: true }
-    );
-  };
-
-  const columns: ColumnsType<DataType> = [
-    {
-      title: "ID",
-      width: 120,
-      render: (_, record: any) => <span>{record.id}</span>,
-    },
-    {
-      title: "匹配规则",
-      width: 500,
-      dataIndex: "name",
-      render: (_, record: any) => (
-        <>
-          {record.type === "event" && (
-            <span>
-              {record.type}@{record.event_type}:{record.event_key}
-            </span>
-          )}
-          {record.type !== "event" && (
-            <span>
-              {record.type}@{record.rule}
-            </span>
-          )}
-        </>
-      ),
-    },
-    {
-      title: "回复内容",
-      dataIndex: "reply_content",
-      render: (reply_content: string) => <span>{reply_content}</span>,
-    },
-    {
-      title: "操作",
-      width: 130,
-      render: (_, record: any) => (
-        <Space>
-          <PerButton
-            type="link"
-            text="编辑"
-            class="c-primary"
-            icon={null}
-            p="mpWechatMessageReply.update"
-            onClick={() => {
-              setUpdateId(record.id);
-              setShowUpdateWin(true);
-            }}
-            disabled={null}
-          />
-          <PerButton
-            type="link"
-            text="删除"
-            class="c-red"
-            icon={null}
-            p="mpWechatMessageReply.destroy"
-            onClick={() => {
-              destory(record.id);
-            }}
-            disabled={null}
-          />
-        </Space>
-      ),
-    },
-  ];
-
-  const resetData = () => {
-    resetLocalSearchParams({
-      page: 1,
-    });
-    setList([]);
-    setRefresh(!refresh);
-  };
-
-  const destory = (id: number) => {
-    if (id === 0) {
-      return;
-    }
-    confirm({
-      title: "操作确认",
-      icon: <ExclamationCircleFilled />,
-      content: "确认删除此VIP？",
-      centered: true,
-      okText: "确认",
-      cancelText: "取消",
-      onOk() {
-        if (loading) {
-          return;
-        }
-        setLoading(true);
-        wechat
-          .destroy(id)
-          .then(() => {
-            setLoading(false);
-            message.success("删除成功");
-            resetData();
-          })
-          .catch((e) => {
-            setLoading(false);
-          });
-      },
-      onCancel() {
-        console.log("Cancel");
-      },
-    });
-  };
-
-  const paginationProps = {
-    current: page, //当前页码
-    pageSize: size,
-    total: total, // 总条数
-    onChange: (page: number, pageSize: number) =>
-      handlePageChange(page, pageSize), //改变页码的函数
-    showSizeChanger: true,
-  };
-
-  const handlePageChange = (page: number, pageSize: number) => {
-    resetLocalSearchParams({
-      page: page,
-      size: pageSize,
-    });
-  };
-
-  return (
-    <div className="meedu-main-body">
-      <WechatCreateDialog
-        open={showAddWin}
-        onCancel={() => setShowAddWin(false)}
-        onSuccess={() => {
-          resetData();
-          setShowAddWin(false);
-        }}
-      />
-      <WechatUpdateDialog
-        id={updateId}
-        open={showUpdateWin}
-        onCancel={() => setShowUpdateWin(false)}
-        onSuccess={() => {
-          resetData();
-          setShowUpdateWin(false);
-        }}
-      />
-      <div className="float-left mb-30">
-        <PerButton
-          type="primary"
-          text="新建自动回复"
-          class=""
-          icon={null}
-          p="mpWechatMessageReply.store"
-          onClick={() => setShowAddWin(true)}
-          disabled={null}
-        />
-        <PerButton
-          type="primary"
-          text="公众号菜单"
-          class="ml-10"
-          icon={null}
-          p="mpWechat.menu"
-          onClick={() => navigate("/wechat/mp-wechat-menu")}
-          disabled={null}
-        />
-        <OptionBar
-          text="公众号配置"
-          value="/system/mp_wechatConfig"
-        ></OptionBar>
-      </div>
-      <div className="float-left">
-        <Table
-          loading={loading}
-          columns={columns}
-          dataSource={list}
-          rowKey={(record) => record.id}
-          pagination={paginationProps}
-        />
-      </div>
-    </div>
-  );
-};
-
-export default WechatPage;
diff --git a/xyz.meedu.admin/src/pages/wechat/mp-wechat-menu/index.tsx b/xyz.meedu.admin/src/pages/wechat/mp-wechat-menu/index.tsx
deleted file mode 100644
index bb7704919..000000000
--- a/xyz.meedu.admin/src/pages/wechat/mp-wechat-menu/index.tsx
+++ /dev/null
@@ -1,660 +0,0 @@
-import { useState, useEffect } from "react";
-import { Modal, message, Space, Button, Input, Select } from "antd";
-import { useNavigate } from "react-router-dom";
-import { useDispatch, useSelector } from "react-redux";
-import { wechat } from "../../../api/index";
-import { titleAction } from "../../../store/user/loginUserSlice";
-import { PerButton, BackBartment } from "../../../components";
-import { wechatUrlRules } from "../../../utils/index";
-import { PlusOutlined, DeleteOutlined } from "@ant-design/icons";
-
-const WechatMenuPage = () => {
-  const dispatch = useDispatch();
-  const navigate = useNavigate();
-  const [loading, setLoading] = useState<boolean>(false);
-  const [menus, setMenus] = useState<any>([]);
-  const [currentIndex, setCurrentIndex] = useState<any>(null);
-  const [currentPIndex, setCurrentPIndex] = useState<any>(null);
-  const [currentItem, setCurrentItem] = useState<any>(null);
-  const types = [
-    {
-      value: "view",
-      label: "跳转网页",
-    },
-    {
-      value: "click",
-      label: "点击事件",
-    },
-    {
-      value: "miniprogram",
-      label: "打开小程序",
-    },
-  ];
-
-  useEffect(() => {
-    document.title = "公众号菜单";
-    dispatch(titleAction("公众号菜单"));
-  }, []);
-
-  const getMenu = () => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    wechat
-      .menuList()
-      .then((res: any) => {
-        let menu = res.data.menu;
-        if (typeof menu.selfmenu_info === "undefined") {
-          // 不是想要的数据
-          return;
-        }
-        let arr: any = [];
-        let data = menu.selfmenu_info.button;
-        data.forEach((item: any) => {
-          if (item.sub_button) {
-            item.sub_button = item.sub_button.list;
-          } else {
-            item.sub_button = [];
-          }
-          arr.push(item);
-        });
-
-        setMenus(arr);
-        setLoading(false);
-      })
-      .catch((e) => {
-        setLoading(false);
-      });
-  };
-
-  const addMenu = () => {
-    let arr = [...menus];
-    if (arr.length >= 3) {
-      return;
-    }
-    arr.push({
-      name: "未命名",
-      type: null,
-      sub_button: [],
-    });
-    setMenus(arr);
-    reset();
-  };
-
-  const sync = () => {
-    if (loading) {
-      return;
-    }
-    if (menus.length == 0) {
-      message.error("请编辑菜单");
-      return;
-    }
-    // 必填检测
-    for (let i = 0; i < menus.length; i++) {
-      let line = i + 1;
-      if (!menus[i].name) {
-        message.error("第" + line + "个菜单的「菜单名」为空");
-        setEditItem(i, null);
-        return;
-      }
-      if (!menus[i].type) {
-        message.error("第" + line + "个菜单的「类型」为空");
-        setEditItem(i, null);
-        return;
-      }
-
-      if (menus[i].type === "view") {
-        if (!menus[i].url) {
-          message.error("第" + line + "个菜单的「网址」为空");
-          setEditItem(i, null);
-          return;
-        }
-        if (wechatUrlRules(menus[i].url)) {
-          message.error(
-            "第" + line + "个菜单的「网址」错误，必须携带http://或https://协议"
-          );
-          setEditItem(i, null);
-          return;
-        }
-      } else if (menus[i].type === "click") {
-        if (!menus[i].key) {
-          message.error("第" + line + "个菜单的「事件key」为空");
-          setEditItem(i, null);
-          return;
-        }
-      } else if (menus[i].type === "miniprogram") {
-        if (!menus[i].appid) {
-          message.error("第" + line + "个菜单的「小程序appid」为空");
-          setEditItem(i, null);
-          return;
-        }
-        if (!menus[i].pagepath) {
-          message.error("第" + line + "个菜单的「小程序打开页面路径」为空");
-          setEditItem(i, null);
-          return;
-        }
-        if (!menus[i].url) {
-          message.error("第" + line + "个菜单的「URL地址」为空");
-          setEditItem(i, null);
-          return;
-        }
-      }
-      if (menus[i].sub_button === undefined) {
-        // 无子菜单
-        if (!menus[i].name) {
-          message.error("第" + line + "个菜单的「菜单名」为空");
-          setEditItem(i, null);
-          return;
-        }
-        if (!menus[i].type) {
-          message.error("第" + line + "个菜单的「类型」为空");
-          setEditItem(i, null);
-          return;
-        }
-
-        if (menus[i].type === "view") {
-          if (!menus[i].url) {
-            message.error("第" + line + "个菜单的「网址」为空");
-            setEditItem(i, null);
-            return;
-          }
-          if (wechatUrlRules(menus[i].url)) {
-            message.error(
-              "第" +
-                line +
-                "个菜单的「网址」错误，必须携带http://或https://协议"
-            );
-            setEditItem(i, null);
-            return;
-          }
-        } else if (menus[i].type === "click") {
-          if (!menus[i].key) {
-            message.error("第" + line + "个菜单的「事件key」为空");
-            setEditItem(i, null);
-            return;
-          }
-        } else if (menus[i].type === "miniprogram") {
-          if (!menus[i].appid) {
-            message.error("第" + line + "个菜单的「小程序appid」为空");
-            setEditItem(i, null);
-            return;
-          }
-          if (!menus[i].pagepath) {
-            message.error("第" + line + "个菜单的「小程序打开页面路径」为空");
-            setEditItem(i, null);
-            return;
-          }
-          if (!menus[i].url) {
-            message.error("第" + line + "个菜单的「URL地址」为空");
-            setEditItem(i, null);
-            return;
-          }
-        }
-        continue;
-      }
-
-      // 存在子菜单
-      for (let j = 0; j < menus[i].sub_button.length; j++) {
-        let cLine = j + 1;
-
-        if (!menus[i].sub_button[j].name) {
-          message.error(
-            "第" + line + "个菜单的第" + cLine + "子菜单的「菜单名」为空"
-          );
-          setEditItem(i, j);
-          return;
-        }
-        if (!menus[i].sub_button[j].type) {
-          message.error(
-            "第" + line + "个菜单的第" + cLine + "子菜单的「类型」为空"
-          );
-          setEditItem(i, j);
-          return;
-        }
-
-        if (menus[i].sub_button[j].type === "view") {
-          if (!menus[i].sub_button[j].url) {
-            message.error(
-              "第" + line + "个菜单的第" + cLine + "子菜单的「网址」为空"
-            );
-            setEditItem(i, j);
-            return;
-          }
-          if (wechatUrlRules(menus[i].sub_button[j].url)) {
-            message.error(
-              "第" +
-                line +
-                "个菜单的第" +
-                cLine +
-                "子菜单的「网址」错误，必须携带http://或https://协议"
-            );
-            setEditItem(i, j);
-            return;
-          }
-        } else if (menus[i].sub_button[j].type === "click") {
-          if (!menus[i].sub_button[j].key) {
-            message.error(
-              "第" + line + "个菜单的第" + cLine + "子菜单的「事件key」为空"
-            );
-            setEditItem(i, j);
-            return;
-          }
-        } else if (menus[i].sub_button[j].type === "miniprogram") {
-          if (!menus[i].sub_button[j].appid) {
-            message.error(
-              "第" + line + "个菜单的第" + cLine + "子菜单的「小程序appid」为空"
-            );
-            setEditItem(i, j);
-            return;
-          }
-          if (!menus[i].sub_button[j].pagepath) {
-            message.error(
-              "第" +
-                line +
-                "个菜单的第" +
-                cLine +
-                "子菜单的「小程序打开页面路径」为空"
-            );
-            setEditItem(i, j);
-            return;
-          }
-          if (!menus[i].sub_button[j].url) {
-            message.error(
-              "第" + line + "个菜单的第" + cLine + "子菜单的「URL地址」为空"
-            );
-            setEditItem(i, j);
-            return;
-          }
-        }
-      }
-    }
-    setLoading(true);
-    let menuData: any = [];
-    menus.forEach((item: any) => {
-      if (item.sub_button && item.sub_button.length === 0) {
-        delete item.sub_button;
-      }
-      menuData.push(item);
-    });
-    wechat
-      .menuUpdate({
-        menu: {
-          button: menuData,
-        },
-      })
-      .then((res: any) => {
-        message.success("成功");
-        setLoading(false);
-      })
-      .catch((e) => {
-        setLoading(false);
-      });
-  };
-
-  const reset = () => {
-    setCurrentIndex(null);
-    setCurrentItem(null);
-    setCurrentPIndex(null);
-  };
-
-  const addChildrenMenu = (index: number) => {
-    let arr = [...menus];
-    if (arr[index].sub_button) {
-      arr[index].sub_button.push({
-        name: "未命名",
-        type: null,
-      });
-    } else {
-      arr[index].sub_button = [];
-      arr[index].sub_button.push({
-        name: "未命名",
-        type: null,
-      });
-    }
-    setMenus(arr);
-    reset();
-  };
-
-  const editMenuItem = (menuItem: any, index: number, pIndex: any) => {
-    setCurrentIndex(index);
-    setCurrentItem(menuItem);
-    setCurrentPIndex(pIndex);
-    console.log(pIndex);
-  };
-
-  const delMenuItem = () => {
-    if (!currentItem) {
-      return;
-    }
-    let arr = [...menus];
-    if (currentPIndex === 0) {
-      arr[currentIndex].sub_button = null;
-    } else if (currentPIndex > 0) {
-      arr[currentIndex].sub_button.splice(currentPIndex, 1);
-    } else {
-      arr.splice(currentIndex, 1);
-    }
-    setMenus(arr);
-    reset();
-  };
-
-  const setEditItem = (index: number, cIndex: any) => {
-    reset();
-    if (cIndex !== null) {
-      setCurrentIndex(index);
-      setCurrentItem(menus[index].sub_button[cIndex]);
-      setCurrentPIndex(cIndex);
-    } else {
-      setCurrentIndex(index);
-      setCurrentItem(menus[index]);
-      setCurrentPIndex(null);
-    }
-  };
-
-  return (
-    <div className="meedu-main-body">
-      <BackBartment title="公众号菜单" />
-      <div className="float-left mt-30">
-        <h3>常见问题</h3>
-        <div className="question-helper-text">
-          1.菜单编辑之后需要点击「更新菜单」按钮将更改同步到微信公众号，这样才是一次正确的菜单更新操作。
-        </div>
-        <div className="question-helper-text">
-          2.点击「更新菜单」按钮之后，已修改的公众号菜单并不是立马就可以看到，最多需要等待10分钟才会看到最新修改的菜单。
-        </div>
-        <div className="question-helper-text">
-          3.自定义菜单最多包括3个一级菜单，每个一级菜单最多包含5个二级菜单。
-        </div>
-        <div className="question-helper-text">
-          4.一级菜单最多4个汉字，二级菜单最多8个汉字，多出来的部分将会以“...”代替。
-        </div>
-      </div>
-      <div className="float-left mt-15 mb-15">
-        <Button type="primary" onClick={() => sync()}>
-          将菜单更新到微信公众号
-        </Button>
-      </div>
-      <div className="mp-menu-edit-box">
-        <div className="menu-render-box">
-          <div className="menus">
-            {menus.length > 0 &&
-              menus.map((item: any, index: number) => (
-                <div className="menu-item" key={index}>
-                  <span
-                    onClick={() => {
-                      editMenuItem(item, index, null);
-                    }}
-                  >
-                    {item.name}
-                  </span>
-                  <div className="children-box">
-                    {!item.sub_button ||
-                      (item.sub_button.length < 5 && (
-                        <div
-                          className="children-menu-item"
-                          onClick={() => addChildrenMenu(index)}
-                        >
-                          <PlusOutlined />
-                        </div>
-                      ))}
-                    {item.sub_button &&
-                      item.sub_button.length > 0 &&
-                      item.sub_button.map(
-                        (childrenItem: any, childrenIndex: number) => (
-                          <div
-                            key={childrenIndex}
-                            className="children-menu-item"
-                            onClick={() =>
-                              editMenuItem(childrenItem, index, childrenIndex)
-                            }
-                          >
-                            {childrenItem.name}
-                          </div>
-                        )
-                      )}
-                  </div>
-                </div>
-              ))}
-            {menus.length < 3 && (
-              <div className="menu-item" onClick={() => addMenu()}>
-                <PlusOutlined />
-              </div>
-            )}
-          </div>
-        </div>
-        {currentItem && (
-          <div className="menu-edit-box">
-            <div className="float-left mb-15">
-              <div className="float-heft question-helper-text mb-10">
-                菜单名 <span className="c-red">*</span>
-              </div>
-              <div className="float-left">
-                <Input
-                  value={currentItem.name}
-                  onChange={(e) => {
-                    let obj = { ...currentItem };
-                    obj.name = e.target.value;
-                    setCurrentItem(obj);
-                    if (currentPIndex !== null) {
-                      let arr = [...menus];
-                      arr[currentIndex].sub_button[currentPIndex].name =
-                        e.target.value;
-                      setMenus(arr);
-                    } else {
-                      let arr = [...menus];
-                      arr[currentIndex].name = e.target.value;
-                      setMenus(arr);
-                    }
-                  }}
-                  placeholder="菜单名"
-                  className="w-300px"
-                ></Input>
-              </div>
-            </div>
-            <div className="float-left mb-15">
-              <div className="float-heft question-helper-text mb-10">
-                菜单类型
-                <span className="c-red">*</span>
-              </div>
-              <div className="float-left">
-                <Select
-                  style={{ width: 300 }}
-                  value={currentItem.type}
-                  onChange={(e) => {
-                    let obj = { ...currentItem };
-                    obj.type = e;
-                    setCurrentItem(obj);
-                    if (currentPIndex !== null) {
-                      let arr = [...menus];
-                      arr[currentIndex].sub_button[currentPIndex].type = e;
-                      setMenus(arr);
-                    } else {
-                      let arr = [...menus];
-                      arr[currentIndex].type = e;
-                      setMenus(arr);
-                    }
-                  }}
-                  allowClear
-                  placeholder="请选择菜单类型"
-                  options={types}
-                />
-              </div>
-            </div>
-            {currentItem.type === "view" && (
-              <div className="float-left mb-15">
-                <div className="float-heft question-helper-text mb-10">
-                  网址
-                  {currentPIndex !== null && <span className="c-red">*</span>}
-                </div>
-                <div className="float-left">
-                  <div className="d-flex">
-                    <div>
-                      <Input
-                        value={currentItem.url}
-                        onChange={(e) => {
-                          let obj = { ...currentItem };
-                          obj.url = e.target.value;
-                          setCurrentItem(obj);
-                          if (currentPIndex !== null) {
-                            let arr = [...menus];
-                            arr[currentIndex].sub_button[currentPIndex].url =
-                              e.target.value;
-                            setMenus(arr);
-                          } else {
-                            let arr = [...menus];
-                            arr[currentIndex].url = e.target.value;
-                            setMenus(arr);
-                          }
-                        }}
-                        placeholder="请输入网址"
-                        className="w-300px"
-                      ></Input>
-                    </div>
-                    {currentItem.url && (
-                      <div className="ml-10 c-red">
-                        {wechatUrlRules(currentItem.url)}
-                      </div>
-                    )}
-                  </div>
-                </div>
-              </div>
-            )}
-            {currentItem.type === "click" && (
-              <div className="float-left mb-15">
-                <div className="float-heft question-helper-text mb-10">
-                  事件Key
-                  {currentPIndex !== null && <span className="c-red">*</span>}
-                </div>
-                <div className="float-left">
-                  <Input
-                    value={currentItem.key}
-                    onChange={(e) => {
-                      let obj = { ...currentItem };
-                      obj.key = e.target.value;
-                      setCurrentItem(obj);
-                      if (currentPIndex !== null) {
-                        let arr = [...menus];
-                        arr[currentIndex].sub_button[currentPIndex].key =
-                          e.target.value;
-                        setMenus(arr);
-                      } else {
-                        let arr = [...menus];
-                        arr[currentIndex].key = e.target.value;
-                        setMenus(arr);
-                      }
-                    }}
-                    placeholder="请输入事件key"
-                    className="w-300px"
-                  ></Input>
-                </div>
-              </div>
-            )}
-            {currentItem.type === "miniprogram" && (
-              <>
-                <div className="float-left mb-15">
-                  <div className="float-heft question-helper-text mb-10">
-                    小程序AppId
-                    {currentPIndex !== null && <span className="c-red">*</span>}
-                  </div>
-                  <div className="float-left">
-                    <Input
-                      value={currentItem.appid}
-                      onChange={(e) => {
-                        let obj = { ...currentItem };
-                        obj.appid = e.target.value;
-                        setCurrentItem(obj);
-                        if (currentPIndex !== null) {
-                          let arr = [...menus];
-                          arr[currentIndex].sub_button[currentPIndex].appid =
-                            e.target.value;
-                          setMenus(arr);
-                        } else {
-                          let arr = [...menus];
-                          arr[currentIndex].appid = e.target.value;
-                          setMenus(arr);
-                        }
-                      }}
-                      placeholder="小程序AppId"
-                      className="w-300px"
-                    ></Input>
-                  </div>
-                </div>
-                <div className="float-left mb-15">
-                  <div className="float-heft question-helper-text mb-10">
-                    小程序打开页面路径
-                    {currentPIndex !== null && <span className="c-red">*</span>}
-                  </div>
-                  <div className="float-left">
-                    <Input
-                      value={currentItem.pagepath}
-                      onChange={(e) => {
-                        let obj = { ...currentItem };
-                        obj.pagepath = e.target.value;
-                        setCurrentItem(obj);
-                        if (currentPIndex !== null) {
-                          let arr = [...menus];
-                          arr[currentIndex].sub_button[currentPIndex].pagepath =
-                            e.target.value;
-                          setMenus(arr);
-                        } else {
-                          let arr = [...menus];
-                          arr[currentIndex].pagepath = e.target.value;
-                          setMenus(arr);
-                        }
-                      }}
-                      placeholder="小程序打开页面路径"
-                      className="w-300px"
-                    ></Input>
-                  </div>
-                </div>
-                <div className="float-left mb-15">
-                  <div className="float-heft question-helper-text mb-10">
-                    URL地址
-                    {currentPIndex !== null && <span className="c-red">*</span>}
-                  </div>
-                  <div className="float-left">
-                    <div className="mb-10">
-                      <Input
-                        value={currentItem.url}
-                        onChange={(e) => {
-                          let obj = { ...currentItem };
-                          obj.url = e.target.value;
-                          setCurrentItem(obj);
-                          if (currentPIndex !== null) {
-                            let arr = [...menus];
-                            arr[currentIndex].sub_button[currentPIndex].url =
-                              e.target.value;
-                            setMenus(arr);
-                          } else {
-                            let arr = [...menus];
-                            arr[currentIndex].url = e.target.value;
-                            setMenus(arr);
-                          }
-                        }}
-                        placeholder="URL地址"
-                        className="w-300px"
-                      ></Input>
-                    </div>
-                    <div>
-                      <span className="question-helper-text">
-                        不支持打开小程序的老版客户端将会打开该地址
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </>
-            )}
-            <div className="float-left">
-              <Button type="primary" danger onClick={() => delMenuItem()}>
-                <DeleteOutlined />
-              </Button>
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default WechatMenuPage;
diff --git a/xyz.meedu.admin/src/pages/wechat/update.tsx b/xyz.meedu.admin/src/pages/wechat/update.tsx
deleted file mode 100644
index 0c35d2fc2..000000000
--- a/xyz.meedu.admin/src/pages/wechat/update.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import { useState, useEffect } from "react";
-import { useNavigate, useLocation } from "react-router-dom";
-import { Button, Input, message, Form, Space, Select, Spin } from "antd";
-import { wechat } from "../../api/index";
-import { useDispatch } from "react-redux";
-import { titleAction } from "../../store/user/loginUserSlice";
-import { BackBartment, HelperText } from "../../components";
-
-const WechatUpdatePage = () => {
-  const result = new URLSearchParams(useLocation().search);
-  const [form] = Form.useForm();
-  const dispatch = useDispatch();
-  const navigate = useNavigate();
-  const [init, setInit] = useState<boolean>(true);
-  const [loading, setLoading] = useState<boolean>(false);
-  const [types, setTypes] = useState<any>([]);
-  const [type, setType] = useState<string>("");
-  const [id, setId] = useState(Number(result.get("id")));
-  const events = [
-    {
-      value: "subscribe",
-      label: "用户关注",
-    },
-    {
-      value: "CLICK",
-      label: "自定义菜单事件",
-    },
-  ];
-
-  useEffect(() => {
-    document.title = "编辑自动回复";
-    dispatch(titleAction("编辑自动回复"));
-    initData();
-  }, [id]);
-
-  useEffect(() => {
-    setId(Number(result.get("id")));
-  }, [result.get("id")]);
-
-  const initData = async () => {
-    await getParams();
-    await getDetail();
-    setInit(false);
-  };
-
-  const getDetail = async () => {
-    if (id === 0) {
-      return;
-    }
-    const res: any = await wechat.detail(id);
-    var data = res.data.data;
-    setType(data.type);
-    form.setFieldsValue({
-      reply_content: data.reply_content,
-      event_key: data.event_key,
-      rule: data.rule,
-      event_type: data.event_type,
-      type: data.type,
-    });
-  };
-
-  const getParams = async () => {
-    const res: any = await wechat.create();
-    const arr = [];
-    let types = res.data.types;
-    for (let i = 0; i < types.length; i++) {
-      arr.push({
-        label: types[i].name,
-        value: types[i].id,
-      });
-    }
-    setTypes(arr);
-  };
-
-  const onFinish = (values: any) => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    wechat
-      .update(id, values)
-      .then((res: any) => {
-        setLoading(false);
-        message.success("保存成功！");
-        navigate(-1);
-      })
-      .catch((e) => {
-        setLoading(false);
-      });
-  };
-
-  const onFinishFailed = (errorInfo: any) => {
-    console.log("Failed:", errorInfo);
-  };
-
-  return (
-    <div className="meedu-main-body">
-      <BackBartment title="编辑自动回复" />
-      {init && (
-        <div className="float-left text-center mt-30">
-          <Spin></Spin>
-        </div>
-      )}
-      <div
-        style={{ display: init ? "none" : "block" }}
-        className="float-left mt-30"
-      >
-        <Form
-          form={form}
-          name="wechat-update"
-          labelCol={{ span: 3 }}
-          wrapperCol={{ span: 21 }}
-          initialValues={{ remember: true }}
-          onFinish={onFinish}
-          onFinishFailed={onFinishFailed}
-          autoComplete="off"
-        >
-          <Form.Item
-            label="消息类型"
-            name="type"
-            rules={[{ required: true, message: "请选择消息类型!" }]}
-          >
-            <Select
-              style={{ width: 300 }}
-              allowClear
-              placeholder="请选择消息类型"
-              options={types}
-              onChange={(e) => {
-                setType(e);
-              }}
-            />
-          </Form.Item>
-          {type === "text" && (
-            <Form.Item label="触发关键字">
-              <Space align="baseline" style={{ height: 32 }}>
-                <Form.Item name="rule">
-                  <Input
-                    style={{ width: 300 }}
-                    placeholder="请输入触发关键字"
-                    allowClear
-                  />
-                </Form.Item>
-                <div className="ml-10">
-                  <HelperText text="支持正则表达式"></HelperText>
-                </div>
-              </Space>
-            </Form.Item>
-          )}
-          {type === "event" && (
-            <>
-              <Form.Item label="事件" name="event_type">
-                <Select
-                  style={{ width: 300 }}
-                  allowClear
-                  placeholder="请选择事件"
-                  options={events}
-                />
-              </Form.Item>
-              <Form.Item label="事件key" name="event_key">
-                <Input
-                  style={{ width: 300 }}
-                  allowClear
-                  placeholder="请输入事件key"
-                />
-              </Form.Item>
-            </>
-          )}
-          <Form.Item
-            label="回复内容"
-            name="reply_content"
-            rules={[{ required: true, message: "请输入回复内容!" }]}
-          >
-            <Input.TextArea
-              style={{ width: 500, minHeight: 120 }}
-              placeholder="请输入回复内容"
-              allowClear
-              maxLength={200}
-            />
-          </Form.Item>
-        </Form>
-      </div>
-      <div className="bottom-menus">
-        <div className="bottom-menus-box">
-          <div>
-            <Button
-              loading={loading}
-              type="primary"
-              onClick={() => form.submit()}
-            >
-              保存
-            </Button>
-          </div>
-          <div className="ml-24">
-            <Button type="default" onClick={() => navigate(-1)}>
-              取消
-            </Button>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default WechatUpdatePage;
diff --git a/xyz.meedu.admin/src/routes/index.tsx b/xyz.meedu.admin/src/routes/index.tsx
index 7de79ad48..52ae12be9 100644
--- a/xyz.meedu.admin/src/routes/index.tsx
+++ b/xyz.meedu.admin/src/routes/index.tsx
@@ -89,13 +89,6 @@ const StatsMemberPage = lazy(() => import("../pages/stats/member"));
 const RolePage = lazy(() => import("../pages/role/index"));
 const RoleCreatePage = lazy(() => import("../pages/role/create"));
 const RoleUpdatePage = lazy(() => import("../pages/role/update"));
-//公众号
-const WechatPage = lazy(() => import("../pages/wechat/index"));
-const WechatCreatePage = lazy(() => import("../pages/wechat/create"));
-const WechatUpdatePage = lazy(() => import("../pages/wechat/update"));
-const WechatMenuPage = lazy(
-  () => import("../pages/wechat/mp-wechat-menu/index")
-);
 //优惠码
 const PromoCodePage = lazy(() => import("../pages/promocode/index"));
 const PromoCodeImportPage = lazy(() => import("../pages/promocode/import"));
@@ -263,22 +256,6 @@ const routes: RouteObject[] = [
           { path: "/order/code-import", element: <PromoCodeImportPage /> },
           { path: "/createcode", element: <PromoCodeCreatePage /> },
           { path: "/createmulticode", element: <PromoCodeCreateMultiPage /> },
-          {
-            path: "/wechat/messagereply/index",
-            element: <WechatPage />,
-          },
-          {
-            path: "/wechat/messagereply/create",
-            element: <WechatCreatePage />,
-          },
-          {
-            path: "/wechat/messagereply/update",
-            element: <WechatUpdatePage />,
-          },
-          {
-            path: "/wechat/mp-wechat-menu",
-            element: <WechatMenuPage />,
-          },
           {
             path: "/system/administrator",
             element: <SystemAdministratorPage />,

From cf2832af1358168e310d3aab16ddda13186051a7 Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 10:53:38 +0800
Subject: [PATCH 08/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 16bddec55..3d25dc116 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -110,14 +110,15 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     const today: any = new Date();
     const now = Date.parse(today);
     let remaining: number = timestamp - now / 1000;
-    if (remaining <= 0) {
+    if (remaining <= 2) {
+      timer && clearInterval(timer);
       countTimer && clearInterval(countTimer);
       setExpired(true);
       return;
     }
     countTimer = setInterval(() => {
       //防止出现负数
-      if (remaining > 0) {
+      if (remaining > 2) {
         remaining--;
         let day = Math.floor(remaining / 3600 / 24);
         let hour = Math.floor((remaining / 3600) % 24);
@@ -131,6 +132,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
           sec: second < 10 ? "0" + second : second,
         });
       } else {
+        timer && clearInterval(timer);
         countTimer && clearInterval(countTimer);
         setExpired(true);
       }

From caabbb79ca4c6260136a6f2601c6b0a9eb22e279 Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 11:07:26 +0800
Subject: [PATCH 09/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/weixin-login-dailog/index.tsx | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 3d25dc116..0461ef625 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -112,6 +112,8 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     let remaining: number = timestamp - now / 1000;
     if (remaining <= 2) {
       timer && clearInterval(timer);
+    } else if (remaining <= 0) {
+      timer && clearInterval(timer);
       countTimer && clearInterval(countTimer);
       setExpired(true);
       return;
@@ -125,6 +127,20 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
         let minute = Math.floor((remaining / 60) % 60);
         let second = Math.floor(remaining % 60);
 
+        setRemainingTime({
+          day: day,
+          hr: hour < 10 ? "0" + hour : hour,
+          min: minute < 10 ? "0" + minute : minute,
+          sec: second < 10 ? "0" + second : second,
+        });
+      } else if (remaining <= 2) {
+        timer && clearInterval(timer);
+        remaining--;
+        let day = Math.floor(remaining / 3600 / 24);
+        let hour = Math.floor((remaining / 3600) % 24);
+        let minute = Math.floor((remaining / 60) % 60);
+        let second = Math.floor(remaining % 60);
+
         setRemainingTime({
           day: day,
           hr: hour < 10 ? "0" + hour : hour,

From f7d1ece50852a945043eaa3bf882cfafbb5aab4e Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 11:07:53 +0800
Subject: [PATCH 10/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 0461ef625..44d7efe5a 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -167,6 +167,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
           footer={null}
           onCancel={() => {
             timer && clearInterval(timer);
+            countTimer && clearInterval(countTimer);
             onCancel();
           }}
           maskClosable={false}

From 49baa4de33c5d3a02dd3609fa45d32c40a9f2821 Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 11:13:31 +0800
Subject: [PATCH 11/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 44d7efe5a..603b2a0f0 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -110,9 +110,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     const today: any = new Date();
     const now = Date.parse(today);
     let remaining: number = timestamp - now / 1000;
-    if (remaining <= 2) {
-      timer && clearInterval(timer);
-    } else if (remaining <= 0) {
+    if (remaining <= 0) {
       timer && clearInterval(timer);
       countTimer && clearInterval(countTimer);
       setExpired(true);
@@ -133,7 +131,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
           min: minute < 10 ? "0" + minute : minute,
           sec: second < 10 ? "0" + second : second,
         });
-      } else if (remaining <= 2) {
+      } else if (remaining <= 2 && remaining > 0) {
         timer && clearInterval(timer);
         remaining--;
         let day = Math.floor(remaining / 3600 / 24);

From fb534f19aa94bb73f62ae2610d5a02777861db5e Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 11:28:18 +0800
Subject: [PATCH 12/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/weixin-login-dailog/index.tsx  | 84 +++++++++----------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 603b2a0f0..127b13f77 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -42,6 +42,8 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
 
   useEffect(() => {
     if (open) {
+      setRemainingTime({ day: 0, hr: 0, min: 0, sec: 0 });
+      setQrode("");
       getQrode();
     }
     return () => {
@@ -56,9 +58,9 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     }
     setLoading(true);
     user.wechatLogin({ action: "login" }).then((res: any) => {
+      setExpired(false);
       setQrode(res.data.url);
       setKey(res.data.key);
-      setExpired(false);
       countdown(res.data.expire);
       timer = setInterval(() => checkWechatLogin(res.data.key), 1000);
       setLoading(false);
@@ -120,31 +122,10 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
       //防止出现负数
       if (remaining > 2) {
         remaining--;
-        let day = Math.floor(remaining / 3600 / 24);
-        let hour = Math.floor((remaining / 3600) % 24);
-        let minute = Math.floor((remaining / 60) % 60);
-        let second = Math.floor(remaining % 60);
-
-        setRemainingTime({
-          day: day,
-          hr: hour < 10 ? "0" + hour : hour,
-          min: minute < 10 ? "0" + minute : minute,
-          sec: second < 10 ? "0" + second : second,
-        });
+        getRemainingTime(remaining);
       } else if (remaining <= 2 && remaining > 0) {
         timer && clearInterval(timer);
-        remaining--;
-        let day = Math.floor(remaining / 3600 / 24);
-        let hour = Math.floor((remaining / 3600) % 24);
-        let minute = Math.floor((remaining / 60) % 60);
-        let second = Math.floor(remaining % 60);
-
-        setRemainingTime({
-          day: day,
-          hr: hour < 10 ? "0" + hour : hour,
-          min: minute < 10 ? "0" + minute : minute,
-          sec: second < 10 ? "0" + second : second,
-        });
+        getRemainingTime(remaining);
       } else {
         timer && clearInterval(timer);
         countTimer && clearInterval(countTimer);
@@ -153,6 +134,20 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     }, 1000);
   };
 
+  const getRemainingTime = (remaining: number) => {
+    const day = Math.floor(remaining / 3600 / 24);
+    const hour = Math.floor((remaining / 3600) % 24);
+    const minute = Math.floor((remaining / 60) % 60);
+    const second = Math.floor(remaining % 60);
+
+    setRemainingTime({
+      day: day,
+      hr: hour < 10 ? "0" + hour : hour,
+      min: minute < 10 ? "0" + minute : minute,
+      sec: second < 10 ? "0" + second : second,
+    });
+  };
+
   return (
     <>
       {open ? (
@@ -183,25 +178,28 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
             </a>
           </div>
           <div className={styles["box"]}>
-            <div className={styles["time"]}>
-              有效期：
-              {remainingTime.day !== 0 && (
-                <span>
-                  {remainingTime.day}天{remainingTime.hr}时{remainingTime.min}分
-                  {remainingTime.sec}秒
-                </span>
-              )}
-              {remainingTime.day === 0 && remainingTime.hr !== "00" && (
-                <span>
-                  {remainingTime.hr}时{remainingTime.min}分{remainingTime.sec}秒
-                </span>
-              )}
-              {remainingTime.day === 0 && remainingTime.hr === "00" && (
-                <span>
-                  {remainingTime.min}分{remainingTime.sec}秒
-                </span>
-              )}
-            </div>
+            {!loading && !expired && qrode !== "" && (
+              <div className={styles["time"]}>
+                有效期：
+                {remainingTime.day !== 0 && (
+                  <span>
+                    {remainingTime.day}天{remainingTime.hr}时{remainingTime.min}
+                    分{remainingTime.sec}秒
+                  </span>
+                )}
+                {remainingTime.day === 0 && remainingTime.hr !== "00" && (
+                  <span>
+                    {remainingTime.hr}时{remainingTime.min}分{remainingTime.sec}
+                    秒
+                  </span>
+                )}
+                {remainingTime.day === 0 && remainingTime.hr === "00" && (
+                  <span>
+                    {remainingTime.min}分{remainingTime.sec}秒
+                  </span>
+                )}
+              </div>
+            )}
             {qrode !== "" && (
               <>
                 {expired ? (

From 7f6d67916eb9c9ca59587c32aa25bf3af2747795 Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 11:34:17 +0800
Subject: [PATCH 13/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/weixin-login-dailog/index.tsx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 127b13f77..9874ef7dd 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -34,15 +34,15 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
   const [expired, setExpired] = useState(false);
   const [remainingTime, setRemainingTime] = useState<any>({
     day: 0,
-    hr: 0,
-    min: 0,
-    sec: 0,
+    hr: "00",
+    min: "00",
+    sec: "00",
   });
   const [redirect, setRedirect] = useState(result.get("redirect"));
 
   useEffect(() => {
     if (open) {
-      setRemainingTime({ day: 0, hr: 0, min: 0, sec: 0 });
+      setRemainingTime({ day: 0, hr: "00", min: "00", sec: "00" });
       setQrode("");
       getQrode();
     }
@@ -124,6 +124,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
         remaining--;
         getRemainingTime(remaining);
       } else if (remaining <= 2 && remaining > 0) {
+        remaining--;
         timer && clearInterval(timer);
         getRemainingTime(remaining);
       } else {
@@ -208,6 +209,13 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
                     size={300}
                     status="expired"
                     onRefresh={() => {
+                      setRemainingTime({
+                        day: 0,
+                        hr: "00",
+                        min: "00",
+                        sec: "00",
+                      });
+                      setQrode("");
                       getQrode();
                     }}
                   />

From 1ae61e3b8cfb7e4d19b384e6443b271007958eb5 Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 11:47:21 +0800
Subject: [PATCH 14/40] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/weixin-bind-mobile-dialog/index.tsx      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-bind-mobile-dialog/index.tsx b/xyz.meedu.pc/src/components/weixin-bind-mobile-dialog/index.tsx
index 1b2c4c713..9cd3faa09 100644
--- a/xyz.meedu.pc/src/components/weixin-bind-mobile-dialog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-bind-mobile-dialog/index.tsx
@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { useParams, useNavigate, useLocation } from "react-router-dom";
 import { Modal, Form, Input, message, Spin, Button, Space, Image } from "antd";
 import styles from "./index.module.scss";
-import { user, system } from "../../api/index";
+import { user, system,login } from "../../api/index";
 import {
   getMsv,
   getLoginCode,
@@ -113,8 +113,8 @@ export const WexinBindMobileDialog: React.FC<PropInterface> = ({
       return;
     }
     setLoading(true);
-    user
-      .wechatCodeBindMobile({
+    login
+      .codeBindMobile({
         mobile: values.mobile,
         code: getLoginCode(),
         mobile_code: values.sms,

From dcd575b77e6436d2e83a0988c624477392772d67 Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 14:22:37 +0800
Subject: [PATCH 15/40] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.admin/src/pages/error/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xyz.meedu.admin/src/pages/error/index.tsx b/xyz.meedu.admin/src/pages/error/index.tsx
index 66c7df9e5..5e3f61d1a 100644
--- a/xyz.meedu.admin/src/pages/error/index.tsx
+++ b/xyz.meedu.admin/src/pages/error/index.tsx
@@ -10,7 +10,7 @@ const ErrorPage = () => {
 
   useEffect(() => {
     const code = result.get("code");
-    let errMsg = result.get("msg") || "系统错误";
+    let errMsg = result.get("msg") || "页面不存在";
     if (code === "403") {
       errMsg = "无权限操作";
     } else if (code === "404") {

From 5eddfdd9f635fb2b56f9f413eac859697043a28a Mon Sep 17 00:00:00 2001
From: "XTZJ-20221127GV\\Administrator" <18119604035@163.com>
Date: Mon, 4 Nov 2024 14:35:56 +0800
Subject: [PATCH 16/40] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=BE=AE=E4=BF=A1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/weixin-login-dailog/index.tsx  |   2 +
 .../components/bind-weixin/index.module.scss  |   3 +
 .../member/components/bind-weixin/index.tsx   | 138 ++++++++++++++++--
 3 files changed, 130 insertions(+), 13 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 9874ef7dd..e343c5ba2 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -85,6 +85,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
             } else {
               if (res.data.action === "bind_mobile") {
                 timer && clearInterval(timer);
+                countTimer && clearInterval(countTimer);
                 saveLoginCode(res.data.code);
                 bindMobile();
               }
@@ -96,6 +97,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
 
   const redirectHandler = () => {
     timer && clearInterval(timer);
+    countTimer && clearInterval(countTimer);
     onCancel();
     if (pathname === "/login") {
       if (redirect) {
diff --git a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.module.scss b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.module.scss
index 58a8e5d24..2e76d7030 100644
--- a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.module.scss
+++ b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.module.scss
@@ -93,4 +93,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  .time {
+    margin-bottom: 16px;
+  }
 }
diff --git a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
index 76b0c97ec..6ceb3350c 100644
--- a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
+++ b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import styles from "./index.module.scss";
-import { message, Modal, Image } from "antd";
-import { user } from "../../../../api/index";
+import { message, Modal, Image, QRCode } from "antd";
+import { user, login } from "../../../../api/index";
 import closeIcon from "../../../../assets/img/commen/icon-close.png";
 
 interface PropInterface {
@@ -11,6 +11,7 @@ interface PropInterface {
 }
 
 var timer: any = null;
+var countTimer: any = null;
 
 export const BindWeixinDialog: React.FC<PropInterface> = ({
   open,
@@ -18,32 +19,94 @@ export const BindWeixinDialog: React.FC<PropInterface> = ({
   success,
 }) => {
   const [qrode, setQrode] = useState<string>("");
-  const [code, setCode] = useState<string>("");
+  const [loading, setLoading] = useState(false);
+  const [key, setKey] = useState("");
+  const [expired, setExpired] = useState(false);
+  const [remainingTime, setRemainingTime] = useState<any>({
+    day: 0,
+    hr: "00",
+    min: "00",
+    sec: "00",
+  });
 
   useEffect(() => {
     if (open) {
+      setRemainingTime({ day: 0, hr: "00", min: "00", sec: "00" });
+      setQrode("");
       getBindQrode();
     }
     return () => {
       timer && clearInterval(timer);
+      countTimer && clearInterval(countTimer);
     };
   }, [open]);
 
   const getBindQrode = () => {
-    user.wechatBind().then((res: any) => {
-      setQrode(res.data.image);
-      setCode(res.data.code);
-      timer = setInterval(() => checkWechatBind(), 3000);
+    if (loading) {
+      return;
+    }
+    setLoading(true);
+    user.wechatLogin({ action: "bind" }).then((res: any) => {
+      setExpired(false);
+      setQrode(res.data.url);
+      setKey(res.data.key);
+      countdown(res.data.expire);
+      timer = setInterval(() => checkWechatBind(res.data.key), 3000);
+      setLoading(false);
+    });
+  };
+
+  const checkWechatBind = (value: any) => {
+    user.checkWechatLogin({ key: value }).then((res: any) => {
+      if (res.data.code && res.data.code !== "0") {
+        login.codeBind({ code: res.data.code }).then((res: any) => {
+          message.success("绑定成功");
+          timer && clearInterval(timer);
+          countTimer && clearInterval(countTimer);
+          success();
+        });
+      }
     });
   };
 
-  const checkWechatBind = () => {
-    user.detail().then((res: any) => {
-      if (res.data.is_bind_wechat === 1) {
-        message.success("绑定成功");
+  const countdown = (timestamp: number) => {
+    const today: any = new Date();
+    const now = Date.parse(today);
+    let remaining: number = timestamp - now / 1000;
+    if (remaining <= 0) {
+      timer && clearInterval(timer);
+      countTimer && clearInterval(countTimer);
+      setExpired(true);
+      return;
+    }
+    countTimer = setInterval(() => {
+      //防止出现负数
+      if (remaining > 2) {
+        remaining--;
+        getRemainingTime(remaining);
+      } else if (remaining <= 2 && remaining > 0) {
+        remaining--;
+        timer && clearInterval(timer);
+        getRemainingTime(remaining);
+      } else {
         timer && clearInterval(timer);
-        success();
+        countTimer && clearInterval(countTimer);
+        setExpired(true);
       }
+    }, 1000);
+  };
+
+  const getRemainingTime = (remaining: number) => {
+    const day = Math.floor(remaining / 3600 / 24);
+    const hour = Math.floor((remaining / 3600) % 24);
+    const minute = Math.floor((remaining / 60) % 60);
+    const second = Math.floor(remaining % 60);
+
+    setRemainingTime({
+      day: day,
+      hr: hour < 10 ? "0" + hour : hour,
+      min: minute < 10 ? "0" + minute : minute,
+      sec: second < 10 ? "0" + second : second,
     });
   };
 
@@ -59,6 +122,7 @@ export const BindWeixinDialog: React.FC<PropInterface> = ({
           footer={null}
           onCancel={() => {
             timer && clearInterval(timer);
+            countTimer && clearInterval(countTimer);
             onCancel();
           }}
           maskClosable={false}
@@ -76,7 +140,55 @@ export const BindWeixinDialog: React.FC<PropInterface> = ({
             />
           </div>
           <div className={styles["box"]}>
-            <Image width={300} height={300} src={qrode} preview={false} />
+            {!loading && !expired && qrode !== "" && (
+              <div className={styles["time"]}>
+                有效期：
+                {remainingTime.day !== 0 && (
+                  <span>
+                    {remainingTime.day}天{remainingTime.hr}时{remainingTime.min}
+                    分{remainingTime.sec}秒
+                  </span>
+                )}
+                {remainingTime.day === 0 && remainingTime.hr !== "00" && (
+                  <span>
+                    {remainingTime.hr}时{remainingTime.min}分{remainingTime.sec}
+                    秒
+                  </span>
+                )}
+                {remainingTime.day === 0 && remainingTime.hr === "00" && (
+                  <span>
+                    {remainingTime.min}分{remainingTime.sec}秒
+                  </span>
+                )}
+              </div>
+            )}
+            {qrode !== "" && (
+              <>
+                {expired ? (
+                  <QRCode
+                    value={qrode}
+                    size={300}
+                    status="expired"
+                    onRefresh={() => {
+                      setRemainingTime({
+                        day: 0,
+                        hr: "00",
+                        min: "00",
+                        sec: "00",
+                      });
+                      setQrode("");
+                      getBindQrode();
+                    }}
+                  />
+                ) : (
+                  <QRCode
+                    value={qrode}
+                    size={300}
+                    status={loading ? "loading" : "active"}
+                  />
+                )}
+              </>
+            )}
           </div>
         </Modal>
       ) : null}

From 5273c8f623bc497c2e1d39ab809b1c19c96ad74e Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Sun, 3 Nov 2024 14:36:54 +0800
Subject: [PATCH 17/40] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/app/Bus/WechatScanBusV2.php     |  49 ++++++
 .../Api/V3/WechatScanLoginController.php      |  74 ++++++++
 .../ServiceV2/Services/ConfigService.php      |   4 +
 .../Services/ConfigServiceInterface.php       |   2 +
 .../views/wechat_scan_login/fail.blade.php    | 119 +++++++++++++
 .../views/wechat_scan_login/index.blade.php   | 163 ++++++++++++++++++
 .../views/wechat_scan_login/success.blade.php |  71 ++++++++
 xyz.meedu.api/routes/frontend-v3.php          |   6 +-
 8 files changed, 487 insertions(+), 1 deletion(-)
 create mode 100644 xyz.meedu.api/app/Bus/WechatScanBusV2.php
 create mode 100644 xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
 create mode 100644 xyz.meedu.api/resources/views/wechat_scan_login/fail.blade.php
 create mode 100644 xyz.meedu.api/resources/views/wechat_scan_login/index.blade.php
 create mode 100644 xyz.meedu.api/resources/views/wechat_scan_login/success.blade.php

diff --git a/xyz.meedu.api/app/Bus/WechatScanBusV2.php b/xyz.meedu.api/app/Bus/WechatScanBusV2.php
new file mode 100644
index 000000000..686cfcda9
--- /dev/null
+++ b/xyz.meedu.api/app/Bus/WechatScanBusV2.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the MeEdu.
+ *
+ * (c) 杭州白书科技有限公司
+ */
+
+namespace App\Bus;
+
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Cache;
+
+class WechatScanBusV2
+{
+
+    public const TTL = 300;
+
+    public function getLoginUrl(): array
+    {
+        $key = Str::random(20);
+        Cache::put($this->cacheKey($key), 0, self::TTL);
+        return [
+            'url' => route('api.v3.wechat-scan-login.page', ['key' => $key]),
+            'expire' => time() + self::TTL,
+        ];
+    }
+
+    public function isValid(string $key): bool
+    {
+        return Cache::has($this->cacheKey($key));
+    }
+
+    public function setCode(string $key, string $code): void
+    {
+        Cache::put($this->cacheKey($key), $code, self::TTL);
+    }
+
+    public function code(string $key): string
+    {
+        return Cache::get($this->cacheKey($key)) ?? '';
+    }
+
+    private function cacheKey(string $key): string
+    {
+        return sprintf('wechat-scan-login:%s', $key);
+    }
+
+}
diff --git a/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php b/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
new file mode 100644
index 000000000..8784d0901
--- /dev/null
+++ b/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the MeEdu.
+ *
+ * (c) 杭州白书科技有限公司
+ */
+
+namespace App\Http\Controllers\Api\V3;
+
+use App\Bus\WechatScanBusV2;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Api\V2\BaseController;
+use App\Meedu\ServiceV2\Services\ConfigServiceInterface;
+
+class WechatScanLoginController extends BaseController
+{
+    public function index(ConfigServiceInterface $configService, Request $request, WechatScanBusV2 $bus)
+    {
+        if ($request->has('login_err_msg')) {
+            // 登录失败
+            $msg = $request->get('login_err_msg');
+            return view('wechat_scan_login.fail', compact('msg'));
+        }
+
+        if ($request->has('login_code')) {
+            // 登录成功
+            $loginCode = $request->get('login_code');
+            $key = $request->get('wechat_scan_key');
+            if (!$loginCode || !$key || !$bus->isValid($key)) {
+                return view('wechat_scan_login.fail', ['msg' => '参数错误']);
+            }
+            $bus->setCode($key, $loginCode);
+            // 网站名
+            $appName = $configService->appName();
+            return view('wechat_scan_login.success', compact('appName'));
+        }
+
+        $key = $request->input('key');
+        if (!$key) {
+            return $this->error(__('参数错误'));
+        }
+
+        $url = route('api.v3.wechat-scan-login.page') . '?' . http_build_query(['wechat_scan_key' => $key]);
+
+        // 登录地址
+        $loginUrl = route('api.v3.login.wechat-oauth') . '?' . http_build_query(['s_url' => $url, 'f_url' => $url, 'action' => 'login']);
+        // 网站名
+        $appName = $configService->appName();
+
+        return view('wechat_scan_login.index', compact('appName', 'loginUrl'));
+    }
+
+    public function getLoginUrl(WechatScanBusV2 $bus)
+    {
+        return $this->data($bus->getLoginUrl());
+    }
+
+    public function query(Request $request, WechatScanBusV2 $bus)
+    {
+        $key = $request->input('key');
+        if (!$key) {
+            return $this->error(__('参数错误'));
+        }
+
+        if ($bus->isValid($key)) {
+            return $this->error(__('参数错误'));
+        }
+
+        $code = $bus->code($key);
+
+        return $this->data(['code' => $code]);
+    }
+}
diff --git a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
index 46e87fe67..64956a696 100644
--- a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
+++ b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
@@ -142,5 +142,9 @@ public function updateTencentVodPlayKey(string $playKey): void
         $this->dao->updateValueByKey(ConfigConstant::TENCENT_VOD_PLAY_KEY, $playKey);
     }
 
+    public function appName(): string
+    {
+        return config('meedu.system.app_name') ?? '';
+    }
 
 }
diff --git a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigServiceInterface.php b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigServiceInterface.php
index 99d6d39e5..de637427c 100644
--- a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigServiceInterface.php
+++ b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigServiceInterface.php
@@ -55,4 +55,6 @@ public function getTencentVodCallbackKey(): string;
     public function updateAliyunVodPlayKey(string $playKey): void;
 
     public function updateTencentVodPlayKey(string $playKey): void;
+
+    public function appName(): string;
 }
diff --git a/xyz.meedu.api/resources/views/wechat_scan_login/fail.blade.php b/xyz.meedu.api/resources/views/wechat_scan_login/fail.blade.php
new file mode 100644
index 000000000..fc0d4a472
--- /dev/null
+++ b/xyz.meedu.api/resources/views/wechat_scan_login/fail.blade.php
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>微信授权登录失败</title>
+    <style>
+        :root {
+            --wechat-bg: #f8f8f8;
+            --wechat-green: #07c160;
+            --wechat-green-hover: #06ad56;
+            --wechat-text: #353535;
+            --wechat-text-secondary: #888888;
+            --wechat-error: #fa5151;
+        }
+
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+            background-color: var(--wechat-bg);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            min-height: 100vh;
+            padding: 1rem;
+        }
+
+        .card {
+            background-color: white;
+            border-radius: 8px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+            width: 100%;
+            max-width: 320px;
+            padding: 1.5rem;
+        }
+
+        .card-title {
+            font-size: 1.25rem;
+            font-weight: normal;
+            color: var(--wechat-text);
+            text-align: center;
+            margin-bottom: 1rem;
+        }
+
+        .card-content {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        }
+
+        .error-icon {
+            width: 48px;
+            height: 48px;
+            border-radius: 50%;
+            background-color: var(--wechat-error);
+            position: relative;
+            margin-bottom: 1rem;
+        }
+
+        .error-icon::before,
+        .error-icon::after {
+            content: '';
+            position: absolute;
+            background-color: white;
+        }
+
+        .error-icon::before {
+            width: 4px;
+            height: 20px;
+            top: 14px;
+            left: 22px;
+        }
+
+        .error-icon::after {
+            width: 4px;
+            height: 4px;
+            border-radius: 50%;
+            bottom: 14px;
+            left: 22px;
+        }
+
+        .error-message {
+            color: var(--wechat-text-secondary);
+            text-align: center;
+            margin-bottom: 1.5rem;
+        }
+
+        .retry-button {
+            background-color: var(--wechat-green);
+            color: white;
+            border: none;
+            border-radius: 4px;
+            padding: 0.75rem 1rem;
+            font-size: 1rem;
+            width: 100%;
+            cursor: pointer;
+            transition: background-color 0.3s ease;
+        }
+
+        .retry-button:hover {
+            background-color: var(--wechat-green-hover);
+        }
+    </style>
+</head>
+<body>
+<div class="card">
+    <h1 class="card-title">授权登录失败</h1>
+    <div class="card-content">
+        <div class="error-icon"></div>
+        <p class="error-message">很抱歉，微信授权登录失败。</p>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/xyz.meedu.api/resources/views/wechat_scan_login/index.blade.php b/xyz.meedu.api/resources/views/wechat_scan_login/index.blade.php
new file mode 100644
index 000000000..ac3b41c19
--- /dev/null
+++ b/xyz.meedu.api/resources/views/wechat_scan_login/index.blade.php
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>微信公众号登录</title>
+    <style>
+        * {
+            box-sizing: border-box;
+            margin: 0;
+            padding: 0;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+            background-color: #f7f7f7;
+            display: flex;
+            flex-direction: column;
+            min-height: 100vh;
+            justify-content: center;
+            align-items: center;
+            padding: 1rem;
+        }
+
+        .container {
+            background-color: white;
+            padding: 1.5rem;
+            border-radius: 8px;
+            box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+            width: 100%;
+            max-width: 400px;
+        }
+
+        h1 {
+            color: #07c160;
+            text-align: center;
+            margin-bottom: 0.5rem;
+            font-size: 1.5rem;
+        }
+
+        p {
+            color: #666;
+            text-align: center;
+            margin-bottom: 1.5rem;
+            font-size: 0.9rem;
+        }
+
+        .btn-wechat {
+            background-color: #07c160;
+            color: white;
+            border: none;
+            padding: 0.75rem 1rem;
+            border-radius: 4px;
+            width: 100%;
+            font-size: 1rem;
+            cursor: pointer;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            transition: background-color 0.3s;
+        }
+
+        .btn-wechat:hover, .btn-wechat:focus {
+            background-color: #06ad56;
+        }
+
+        .btn-wechat::before {
+            content: "";
+            display: inline-block;
+            width: 24px;
+            height: 24px;
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 11.9C4 7.6 7.6 4 12 4s8 3.6 8 7.9c0 4.3-3.6 7.9-8 7.9-1 0-1.9-.2-2.8-.5l-2.7 1.5c-.3.2-.7 0-.8-.3v-2.9c-1.1-1.3-1.7-3-1.7-4.7z'%3E%3C/path%3E%3C/svg%3E");
+            background-size: contain;
+            margin-right: 0.5rem;
+        }
+
+        .terms {
+            margin-top: 1rem;
+            display: flex;
+            align-items: flex-start;
+        }
+
+        .terms input[type="checkbox"] {
+            margin-right: 0.5rem;
+            margin-top: 0.25rem;
+        }
+
+        .terms label {
+            font-size: 0.8rem;
+            color: #666;
+            line-height: 1.4;
+        }
+
+        .terms a {
+            color: #07c160;
+            text-decoration: none;
+        }
+
+        .terms a:hover, .terms a:focus {
+            text-decoration: underline;
+        }
+
+        footer {
+            margin-top: 1.5rem;
+            color: #999;
+            font-size: 0.75rem;
+            text-align: center;
+        }
+
+        @media (max-width: 480px) {
+            .container {
+                padding: 1rem;
+            }
+
+            h1 {
+                font-size: 1.3rem;
+            }
+
+            p {
+                font-size: 0.85rem;
+            }
+
+            .btn-wechat {
+                font-size: 0.9rem;
+            }
+
+            .terms label {
+                font-size: 0.75rem;
+            }
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <h1>微信公众号登录</h1>
+    <p>使用您的微信账号登录</p>
+    <button onclick="handleLogin()" class="btn-wechat">微信登录</button>
+    <div class="terms">
+        <input type="checkbox" id="agree" required>
+        <label for="agree">
+            我已阅读并同意
+            <a href="{{route('user.protocol')}}" target="_blank">用户协议</a>
+            和
+            <a href="{{route('user.private_protocol')}}" target="_blank">隐私政策</a>
+        </label>
+    </div>
+</div>
+<footer>
+    © {{date('Y')}} {{$appName}}
+</footer>
+
+<script>
+    function handleLogin() {
+        const agreeCheckbox = document.getElementById('agree');
+        if (!agreeCheckbox.checked) {
+            alert('请先同意用户协议和隐私政策');
+            return;
+        }
+        window.location.href = '{!! $loginUrl !!}';
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/xyz.meedu.api/resources/views/wechat_scan_login/success.blade.php b/xyz.meedu.api/resources/views/wechat_scan_login/success.blade.php
new file mode 100644
index 000000000..28ab07d0a
--- /dev/null
+++ b/xyz.meedu.api/resources/views/wechat_scan_login/success.blade.php
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>微信公众号登录成功</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+            background-color: #EDEDED;
+            display: flex;
+            flex-direction: column;
+            min-height: 100vh;
+            justify-content: center;
+            align-items: center;
+            padding: 20px;
+        }
+
+        .container {
+            background-color: white;
+            border-radius: 8px;
+            box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+            padding: 30px;
+            width: 100%;
+            max-width: 320px;
+            text-align: center;
+        }
+
+        .avatar {
+            width: 80px;
+            height: 80px;
+            border-radius: 50%;
+            margin: 0 auto 20px;
+            display: block;
+            background-color: #f0f0f0;
+        }
+
+        h1 {
+            color: #333;
+            font-size: 20px;
+            margin-bottom: 10px;
+        }
+
+        p {
+            color: #666;
+            margin-bottom: 20px;
+        }
+
+        footer {
+            margin-top: 30px;
+            color: #999;
+            font-size: 12px;
+        }
+    </style>
+</head>
+<body>
+<main class="container" role="main">
+    <h1>登录成功</h1>
+    <p>您可以关闭当前窗口啦！</p>
+</main>
+<footer>
+    <p>© {{date('Y')}} {{$appName}}</p>
+</footer>
+</body>
+</html>
\ No newline at end of file
diff --git a/xyz.meedu.api/routes/frontend-v3.php b/xyz.meedu.api/routes/frontend-v3.php
index 98020b522..6caef2d38 100644
--- a/xyz.meedu.api/routes/frontend-v3.php
+++ b/xyz.meedu.api/routes/frontend-v3.php
@@ -10,11 +10,15 @@
 
 Route::get('/status', 'SystemController@status');
 
-Route::get('/auth/login/wechat/oauth', 'LoginController@wechatOauthLogin');
+Route::get('/auth/login/wechat/oauth', 'LoginController@wechatOauthLogin')->name('api.v3.login.wechat-oauth');
 Route::get('/auth/login/wechat/callback', 'LoginController@wechatOauthCallback')->name('api.v3.login.wechat.callback');
 Route::get('/auth/login/socialite/{app}', 'LoginController@socialiteLogin');
 Route::get('/auth/login/socialite/{app}/callback', 'LoginController@socialiteLoginCallback')->name('api.v3.login.socialite.callback');
 
+Route::get('/auth/login/wechat-scan/page', 'WechatScanLoginController@index')->name('api.v3.wechat-scan-login.page');
+Route::post('/auth/login/wechat-scan/url', 'WechatScanLoginController@getLoginUrl');
+Route::get('/auth/login/wechat-scan/query', 'WechatScanLoginController@query');
+
 Route::get('/auth/login/wechat/scan', 'LoginController@wechatScan');
 Route::get('/auth/login/wechat/scan/query', 'LoginController@wechatScanQuery');
 

From 47c295eb49d01a8a8399d8fd76face44942ecfe8 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Sun, 3 Nov 2024 14:47:48 +0800
Subject: [PATCH 18/40] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=99=BB=E5=BD=95=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A5=E5=8F=8A=E8=80=81=E7=9A=84=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/app/Bus/WechatScanBus.php       | 126 -----------------
 .../app/Hooks/MpWechatMessageReplyHook.php    |  59 --------
 .../app/Hooks/MpWechatScanEvtSubHook.php      | 101 --------------
 .../app/Hooks/MpWechatSubscribeHook.php       | 112 ---------------
 .../Controllers/Api/V3/LoginController.php    | 129 ------------------
 .../Controllers/Api/V3/MemberController.php   |  32 -----
 xyz.meedu.api/app/Meedu/Core/Upgrade.php      |   2 +
 .../Meedu/Core/UpgradeLog/UpgradeToV4911.php  |   8 +-
 .../Meedu/Core/UpgradeLog/UpgradeV4912.php    |  39 ++++++
 xyz.meedu.api/app/Meedu/MeEdu.php             |   2 +-
 .../app/Providers/HooksRegisterProvider.php   |   8 --
 .../database/seeders/AppConfigSeeder.php      |  18 +--
 xyz.meedu.api/routes/frontend-v3.php          |   4 -
 13 files changed, 47 insertions(+), 593 deletions(-)
 delete mode 100644 xyz.meedu.api/app/Bus/WechatScanBus.php
 delete mode 100644 xyz.meedu.api/app/Hooks/MpWechatMessageReplyHook.php
 delete mode 100644 xyz.meedu.api/app/Hooks/MpWechatScanEvtSubHook.php
 delete mode 100644 xyz.meedu.api/app/Hooks/MpWechatSubscribeHook.php
 create mode 100644 xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php

diff --git a/xyz.meedu.api/app/Bus/WechatScanBus.php b/xyz.meedu.api/app/Bus/WechatScanBus.php
deleted file mode 100644
index 2ef18568f..000000000
--- a/xyz.meedu.api/app/Bus/WechatScanBus.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Bus;
-
-use Illuminate\Support\Str;
-use App\Constant\CacheConstant;
-use Illuminate\Support\Facades\Cache;
-
-class WechatScanBus
-{
-    const LOGIN_PREFIX = 'scan_v2_';
-    const BIND_PREFIX = 'bind_v2_';
-
-    /**
-     * 获取登录随机code
-     *
-     * @return string
-     */
-    public function generateLoginCode(): string
-    {
-        return self::LOGIN_PREFIX . Str::random(10);
-    }
-
-    /**
-     * 判断是否登录code
-     *
-     * @param string $code
-     * @return bool
-     */
-    public function isLoginAction(string $code): bool
-    {
-        return Str::startsWith($code, self::LOGIN_PREFIX);
-    }
-
-    /**
-     * 获取绑定随机code
-     *
-     * @param string $userId
-     * @return string
-     */
-    public function generateBindCode(string $userId): string
-    {
-        return self::BIND_PREFIX . $userId;
-    }
-
-    /**
-     * @param string $code
-     * @return int
-     */
-    public function bindUserId(string $code): int
-    {
-        return (int)str_replace(self::BIND_PREFIX, '', $code);
-    }
-
-    /**
-     * 判断是否绑定code
-     * @param string $code
-     * @return bool
-     */
-    public function isBindAction(string $code): bool
-    {
-        return Str::startsWith($code, self::BIND_PREFIX);
-    }
-
-    /**
-     * 设置登录的userId
-     *
-     * @param string $code
-     * @param int $userId
-     * @return void
-     */
-    public function setLoginUserId(string $code, int $userId): void
-    {
-        $cacheKey = get_cache_key(CacheConstant::WECHAT_SCAN['name'], $code);
-        Cache::put($cacheKey, $userId, CacheConstant::WECHAT_SCAN['expire']);
-    }
-
-    /**
-     * 获取登录后的userId
-     *
-     * @param string $code
-     * @return int
-     */
-    public function getLoginUserId(string $code): int
-    {
-        $cacheKey = get_cache_key(CacheConstant::WECHAT_SCAN['name'], $code);
-        return (int)Cache::get($cacheKey);
-    }
-
-    /**
-     * @param string $code
-     * @param $data
-     * @return void
-     */
-    public function setLoginUser(string $code, $data): void
-    {
-        $cacheKey = get_cache_key(CacheConstant::WECHAT_SCAN_USER['name'], $code);
-        Cache::put($cacheKey, $data, CacheConstant::WECHAT_SCAN_USER['expire']);
-    }
-
-    /**
-     * @param string $code
-     * @return mixed
-     */
-    public function getLoginUser(string $code)
-    {
-        $cacheKey = get_cache_key(CacheConstant::WECHAT_SCAN_USER['name'], $code);
-        return Cache::get($cacheKey);
-    }
-
-    /**
-     * @param string $code
-     * @return void
-     */
-    public function delLoginUser(string $code): void
-    {
-        $cacheKey = get_cache_key(CacheConstant::WECHAT_SCAN_USER['name'], $code);
-        Cache::forget($cacheKey);
-    }
-}
diff --git a/xyz.meedu.api/app/Hooks/MpWechatMessageReplyHook.php b/xyz.meedu.api/app/Hooks/MpWechatMessageReplyHook.php
deleted file mode 100644
index 2f83960cd..000000000
--- a/xyz.meedu.api/app/Hooks/MpWechatMessageReplyHook.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Hooks;
-
-use App\Meedu\Hooks\HookParams;
-use App\Meedu\Hooks\HookRuntimeInterface;
-use App\Services\Other\Interfaces\MpWechatServiceInterface;
-
-class MpWechatMessageReplyHook implements HookRuntimeInterface
-{
-    public const MSG_TYPE_TEXT = 'text';
-    public const MSG_TYPE_EVENT = 'event';
-
-    public function handle(HookParams $params, \Closure $next)
-    {
-        $types = [self::MSG_TYPE_TEXT => 1, self::MSG_TYPE_EVENT => 1];
-        $msgType = $params->getValue('MsgType', '');
-        if (!isset($types[$msgType])) {
-            return $next($params);
-        }
-
-        /**
-         * @var HookParams $response
-         */
-        $response = $next($params);
-        if ($response) {
-            // 如果已经有其它的中间件处理了该条消息并返回了值
-            // 那么这里就不需要继续处理了
-            // 当前中间件的权重是最低的
-            return $response;
-        }
-
-        /**
-         * @var MpWechatServiceInterface $mpWechatService
-         */
-        $mpWechatService = app()->make(MpWechatServiceInterface::class);
-
-        try {
-            if ($msgType === self::MSG_TYPE_TEXT) {
-                // 文本消息
-                return $mpWechatService->textMessageReplyFind($params->getValue('raw.Content', ''));
-            } elseif ($msgType === self::MSG_TYPE_EVENT) {
-                // 事件消息
-                $event = $params->getValue('raw.Event');
-                $eventKey = $params->getValue('raw.EventKey');
-
-                return $mpWechatService->eventMessageReplyFind($event, $eventKey);
-            }
-        } catch (\Exception $e) {
-            exception_record($e);
-        }
-    }
-}
diff --git a/xyz.meedu.api/app/Hooks/MpWechatScanEvtSubHook.php b/xyz.meedu.api/app/Hooks/MpWechatScanEvtSubHook.php
deleted file mode 100644
index cfb8b43e4..000000000
--- a/xyz.meedu.api/app/Hooks/MpWechatScanEvtSubHook.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Hooks;
-
-use App\Bus\AuthBus;
-use App\Meedu\Wechat;
-use App\Bus\WechatScanBus;
-use App\Meedu\Hooks\HookParams;
-use App\Constant\FrontendConstant;
-use App\Exceptions\ServiceException;
-use App\Meedu\Hooks\HookRuntimeInterface;
-use App\Meedu\ServiceV2\Services\UserService;
-use App\Meedu\ServiceV2\Services\UserServiceInterface;
-
-class MpWechatScanEvtSubHook implements HookRuntimeInterface
-{
-    public function handle(HookParams $params, \Closure $next)
-    {
-        $msgType = $params->getValue('MsgType', '');
-        $event = $params->getValue('raw.Event', '');
-
-        // 仅订阅subscribe,SCAN事件
-        if (!($msgType === 'event' && ($event === 'subscribe' || $event === 'SCAN'))) {
-            return $next($params);
-        }
-
-        // 剔除`qrscene_`这个前缀,剩余的字符串就是自定义二维码携带的自定义参数
-        $eventKey = str_replace('qrscene_', '', $params->getValue('raw.EventKey'));
-        if (!$eventKey) {
-            // case: 直接关注公众号event
-            return $next($params);
-        }
-
-        /**
-         * @var WechatScanBus $wechatScanBus
-         */
-        $wechatScanBus = app()->make(WechatScanBus::class);
-        if ($wechatScanBus->isLoginAction($eventKey) === false && $wechatScanBus->isBindAction($eventKey) === false) {
-            return $next($params);
-        }
-
-        $openid = $params->getValue('FromUserName');
-        // 通过openid获取微信用户信息[主要是为了unionId]
-        $userData = (array)Wechat::getInstance()->user->get($openid);
-
-        if ($wechatScanBus->isLoginAction($eventKey)) {
-            /**
-             * @var AuthBus $authBus
-             */
-            $authBus = app()->make(AuthBus::class);
-            $loginUserId = $authBus->wechatLogin($openid, $userData['unionid'] ?? '', $userData);
-
-            // 将userId写入到缓存
-            $wechatScanBus->setLoginUserId($eventKey, $loginUserId);
-
-            // 登录提示语
-            if ($loginUserId === AuthBus::ERROR_CODE_BIND_MOBILE) {
-                $params->setResponse(__('请绑定手机号'));
-                // 将登录获取到的用户写入到缓存-将用于手机号绑定操作
-                $wechatScanBus->setLoginUser($eventKey, $userData);
-            } elseif ($loginUserId === 0) {
-                $params->setResponse(__('系统错误'));
-            } else {
-                $params->setResponse(__('登录成功'));
-            }
-        } elseif ($wechatScanBus->isBindAction($eventKey)) {
-            $bindUserId = $wechatScanBus->bindUserId($eventKey);
-            if (!$bindUserId) {
-                $params->setResponse(__('系统错误'));
-            } else {
-                try {
-                    /**
-                     * @var UserService $userService
-                     */
-                    $userService = app()->make(UserServiceInterface::class);
-                    $userService->socialiteBind(
-                        $bindUserId,
-                        FrontendConstant::WECHAT_LOGIN_SIGN,
-                        $openid,
-                        $userData,
-                        $userData['unionid'] ?? ''
-                    );
-                    $params->setResponse(__('已成功绑定当前微信账号'));
-                } catch (ServiceException $e) {
-                    $params->setResponse($e->getMessage());
-                } catch (\Exception $e) {
-                    exception_record($e);
-                    $params->setResponse(__('系统错误'));
-                }
-            }
-        }
-
-        return $next($params);
-    }
-}
diff --git a/xyz.meedu.api/app/Hooks/MpWechatSubscribeHook.php b/xyz.meedu.api/app/Hooks/MpWechatSubscribeHook.php
deleted file mode 100644
index 24d1e0f26..000000000
--- a/xyz.meedu.api/app/Hooks/MpWechatSubscribeHook.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Hooks;
-
-use App\Bus\AuthBus;
-use App\Meedu\Wechat;
-use App\Bus\WechatBindBus;
-use App\Bus\WechatScanBus;
-use App\Constant\CacheConstant;
-use App\Meedu\Hooks\HookParams;
-use App\Exceptions\ServiceException;
-use App\Meedu\Hooks\HookRuntimeInterface;
-use App\Services\Base\Services\CacheService;
-use App\Services\Base\Interfaces\CacheServiceInterface;
-use App\Services\Base\Interfaces\ConfigServiceInterface;
-
-// @Deprecated
-class MpWechatSubscribeHook implements HookRuntimeInterface
-{
-    public function handle(HookParams $params, \Closure $next)
-    {
-        $msgType = $params->getValue('MsgType', '');
-        $event = $params->getValue('raw.Event', '');
-
-        // 仅订阅subscribe,SCAN事件
-        if (!($msgType === 'event' && ($event === 'subscribe' || $event === 'SCAN'))) {
-            return $next($params);
-        }
-
-        // 剔除`qrscene_`这个前缀,剩余的字符串就是自定义二维码携带的自定义参数
-        $eventKey = str_replace('qrscene_', '', $params->getValue('raw.EventKey'));
-        if (!$eventKey) {
-            // case: 直接关注公众号event
-            return $next($params);
-        }
-
-        /**
-         * @var WechatScanBus $wechatScanBus
-         */
-        $wechatScanBus = app()->make(WechatScanBus::class);
-        if ($wechatScanBus->isLoginAction($eventKey) || $wechatScanBus->isBindAction($eventKey)) {
-            // v2-handler
-            return $next($params);
-        }
-
-        $openid = $params->getValue('FromUserName');
-        // 通过openid获取微信用户信息
-        $userData = Wechat::getInstance()->user->get($openid);
-        $unionId = $userData['unionid'] ?? '';
-
-        /**
-         * @var WechatBindBus $wechatBindBus
-         */
-        $wechatBindBus = app()->make(WechatBindBus::class);
-
-        if ($wechatBindBus->isBind($eventKey)) {
-            // 微信公众号扫码绑定
-            try {
-                $wechatBindBus->handle($eventKey, $openid, (array)$userData);
-
-                $params->setResponse(__('微信账号已成功绑定'));
-            } catch (ServiceException $exception) {
-                $params->setResponse($exception->getMessage());
-            } catch (\Exception $exception) {
-                exception_record($exception);
-                $params->setResponse(__('系统错误'));
-            }
-            return $next($params);
-        }
-
-
-        // ------
-        // 下面是微信公众号扫码登录逻辑
-        // ------
-
-        /**
-         * @var AuthBus $authBus
-         */
-        $authBus = app()->make(AuthBus::class);
-
-        $userId = $authBus->wechatLogin($openid, $unionId, (array)$userData);
-
-        // 写入到缓存
-        /**
-         * @var CacheService $cacheService
-         */
-        $cacheService = app()->make(CacheServiceInterface::class);
-
-        $cacheService->put(
-            get_cache_key(CacheConstant::WECHAT_SCAN_LOGIN['name'], $eventKey),
-            $userId,
-            CacheConstant::WECHAT_SCAN_LOGIN['expire']
-        );
-
-        /**
-         * @var ConfigServiceInterface $configService
-         */
-        $configService = app()->make(ConfigServiceInterface::class);
-        $replyContent = $configService->getMpWechatScanLoginAlert() ?? '';
-
-        // 登录成功的回复语
-        $params->setResponse($replyContent);
-
-        return $next($params);
-    }
-}
diff --git a/xyz.meedu.api/app/Http/Controllers/Api/V3/LoginController.php b/xyz.meedu.api/app/Http/Controllers/Api/V3/LoginController.php
index 16b4b0873..7b5af815c 100644
--- a/xyz.meedu.api/app/Http/Controllers/Api/V3/LoginController.php
+++ b/xyz.meedu.api/app/Http/Controllers/Api/V3/LoginController.php
@@ -10,12 +10,10 @@
 
 use App\Bus\AuthBus;
 use App\Meedu\Wechat;
-use App\Bus\WechatScanBus;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Constant\CacheConstant;
 use App\Meedu\Utils\AppRedirect;
-use App\Businesses\BusinessState;
 use App\Constant\FrontendConstant;
 use App\Exceptions\ServiceException;
 use Illuminate\Support\Facades\Cache;
@@ -343,131 +341,4 @@ public function registerWithSocialite(Request $request, AuthBus $authBus, UserSe
             return $this->error($e->getMessage());
         }
     }
-
-    /**
-     * @api {GET} /api/v3/auth/login/wechat/scan 微信公众号扫码登录
-     * @apiGroup Auth-V3
-     * @apiName  AuthLoginWechatScan
-     * @apiVersion v3.0.0
-     * @apiDescription v4.8新增
-     *
-     * @apiSuccess {Number} code 0成功,非0失败
-     * @apiSuccess {Object} data 数据
-     * @apiSuccess {String} data.code code
-     * @apiSuccess {String} data.image 二维码
-     */
-    public function wechatScan(BusinessState $businessState, WechatScanBus $wechatScanBus)
-    {
-        if (!$businessState->enabledMpScanLogin()) {
-            throw new ServiceException(__('未开启微信公众号扫码登录'));
-        }
-
-        $code = $wechatScanBus->generateLoginCode();
-        // 该方法会生成携带自定义参数的(上面的code)二维码,用户扫码即可关注
-        // 关注之后服务端会收到SCAN+自定义参数的事件
-        $image = wechat_qrcode_image($code);
-
-        return $this->data([
-            'code' => $code,
-            'image' => $image,
-        ]);
-    }
-
-    /**
-     * @api {GET} /api/v3/auth/login/wechat/scan/query 微信公众号扫码登录结果查询
-     * @apiGroup Auth-V3
-     * @apiName  AuthLoginWechatScanQuery
-     * @apiVersion v3.0.0
-     * @apiDescription v4.8新增
-     *
-     * @apiParam {string} code code
-     *
-     * @apiSuccess {Number} code 0成功,非0失败
-     * @apiSuccess {Object} data 数据
-     * @apiSuccess {String} data.success 状态[-1:不做任何操作,1:登录成功,0:登录失败]
-     * @apiSuccess {String} data.token token
-     * @apiSuccess {String} data.code code(失败返回)
-     * @apiSuccess {String} data.action action[bind_mobile:绑定手机号](失败返回)
-     */
-    public function wechatScanQuery(Request $request, AuthBus $authBus, WechatScanBus $wechatScanBus)
-    {
-        $code = $request->input('code');
-        if (!$code) {
-            return $this->error(__('参数错误'));
-        }
-
-        $userId = $wechatScanBus->getLoginUserId($code);
-        if (!$userId) {
-            return $this->data(['success' => -1]);
-        }
-
-        if ($userId === AuthBus::ERROR_CODE_BIND_MOBILE) {
-            return $this->data([
-                'success' => 0,
-                'action' => 'bind_mobile',
-                'code' => $code,
-            ]);
-        }
-
-        $token = $authBus->tokenLogin($userId, FrontendConstant::LOGIN_PLATFORM_PC);
-
-        return $this->data([
-            'success' => 1,
-            'token' => $token,
-        ]);
-    }
-
-    /**
-     * @api {POST} /api/v3/auth/register/withWechatScan 微信扫码注册[绑定手机号]
-     * @apiGroup Auth-V3
-     * @apiName  AuthRegisterWithWechatScan
-     * @apiVersion v3.0.0
-     * @apiDescription v4.8新增
-     *
-     * @apiParam {String} code 微信扫码的code
-     * @apiParam {String} mobile 手机号
-     * @apiParam {String} mobile_code 短信验证码
-     *
-     * @apiSuccess {Number} code 0成功,非0失败
-     * @apiSuccess {Object} data 数据
-     * @apiSuccess {String} data.token 用户token
-     */
-    public function registerWithWechatScan(Request $request, AuthBus $authBus, WechatScanBus $wechatScanBus, UserServiceInterface $userService)
-    {
-        $mobile = $request->input('mobile');
-        $code = $request->input('code');
-        if (!$mobile || !$code) {
-            return $this->error(__('参数错误'));
-        }
-
-        $this->mobileCodeCheck();
-
-        $userData = $wechatScanBus->getLoginUser($code);
-        if (!$userData) {
-            return $this->error(__('已过期'));
-        }
-
-        $userId = $authBus->registerWithSocialite(
-            $mobile,
-            FrontendConstant::WECHAT_LOGIN_SIGN,
-            $userData['openid'],
-            $userData['unionid'] ?? '',
-            '',
-            '',
-            $userData
-        );
-
-        // 注册默认锁定判断
-        $user = $userService->findUserById($userId);
-        if ($user['is_lock'] === 1) {
-            throw new ServiceException(__('用户已锁定无法登录'));
-        }
-
-        // 删除缓存
-        $wechatScanBus->delLoginUser($code);
-
-        $token = $authBus->tokenLogin($userId, FrontendConstant::LOGIN_PLATFORM_PC);
-
-        return $this->data(['token' => $token]);
-    }
 }
diff --git a/xyz.meedu.api/app/Http/Controllers/Api/V3/MemberController.php b/xyz.meedu.api/app/Http/Controllers/Api/V3/MemberController.php
index a847cbe3e..e2db43496 100644
--- a/xyz.meedu.api/app/Http/Controllers/Api/V3/MemberController.php
+++ b/xyz.meedu.api/app/Http/Controllers/Api/V3/MemberController.php
@@ -10,12 +10,10 @@
 
 use Carbon\Carbon;
 use App\Bus\MemberBus;
-use App\Bus\WechatScanBus;
 use App\Meedu\Tencent\Face;
 use Illuminate\Http\Request;
 use App\Constant\BusConstant;
 use App\Constant\CacheConstant;
-use App\Businesses\BusinessState;
 use App\Constant\FrontendConstant;
 use App\Exceptions\ServiceException;
 use Illuminate\Support\Facades\Cache;
@@ -357,36 +355,6 @@ public function socialiteBindByCode(Request $request, UserServiceInterface $user
         }
     }
 
-    /**
-     * @api {GET} /api/v3/member/wechatScanBind 微信账号扫码绑定
-     * @apiGroup 用户-V3
-     * @apiName  MemberWechatScanBind
-     * @apiVersion v3.0.0
-     * @apiHeader Authorization Bearer+空格+token
-     * @apiDescription v4.8新增*
-     *
-     * @apiSuccess {Number} code 0成功,非0失败
-     * @apiSuccess {Object} data 数据
-     * @apiSuccess {String} data.code code
-     * @apiSuccess {String} data.image 二维码
-     */
-    public function wechatScanBind(BusinessState $businessState, WechatScanBus $wechatScanBus)
-    {
-        if (!$businessState->enabledMpScanLogin()) {
-            throw new ServiceException(__('未开启微信公众号扫码登录'));
-        }
-
-        $code = $wechatScanBus->generateBindCode($this->id());
-        // 该方法会生成携带自定义参数的(上面的code)二维码,用户扫码即可关注
-        // 关注之后服务端会收到SCAN+自定义参数的事件
-        $image = wechat_qrcode_image($code);
-
-        return $this->data([
-            'code' => $code,
-            'image' => $image,
-        ]);
-    }
-
     /**
      * @api {POST} /api/v3/member/tencent/faceVerify 微信实人认证
      * @apiGroup 用户-V3
diff --git a/xyz.meedu.api/app/Meedu/Core/Upgrade.php b/xyz.meedu.api/app/Meedu/Core/Upgrade.php
index 2cf2c4990..4ef081a9f 100644
--- a/xyz.meedu.api/app/Meedu/Core/Upgrade.php
+++ b/xyz.meedu.api/app/Meedu/Core/Upgrade.php
@@ -16,6 +16,7 @@
 use App\Meedu\Core\UpgradeLog\UpgradeToV45;
 use App\Meedu\Core\UpgradeLog\UpgradeToV46;
 use App\Meedu\Core\UpgradeLog\UpgradeV4910;
+use App\Meedu\Core\UpgradeLog\UpgradeV4912;
 use App\Meedu\Core\UpgradeLog\UpgradeToV454;
 use App\Meedu\Core\UpgradeLog\UpgradeToV4911;
 
@@ -33,5 +34,6 @@ public function run()
         UpgradeV498::handle();
         UpgradeV4910::handle();
         UpgradeToV4911::handle();
+        UpgradeV4912::handle();
     }
 }
diff --git a/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeToV4911.php b/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeToV4911.php
index aa584893d..5cb2a9f25 100644
--- a/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeToV4911.php
+++ b/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeToV4911.php
@@ -23,7 +23,7 @@ public static function handle()
         self::hideSomeConfigItems();
     }
 
-    public static function deleteSomePermissions()
+    private static function deleteSomePermissions()
     {
         AdministratorPermission::query()
             ->whereIn('slug', [
@@ -32,7 +32,7 @@ public static function deleteSomePermissions()
             ->delete();
     }
 
-    public static function deleteSomeConfigItems()
+    private static function deleteSomeConfigItems()
     {
         AppConfig::query()
             ->whereIn('key', [
@@ -53,7 +53,7 @@ public static function deleteSomeConfigItems()
             ->delete();
     }
 
-    public static function upgradeImageDiskConfigItem()
+    private static function upgradeImageDiskConfigItem()
     {
         AppConfig::query()
             ->where('key', 'meedu.upload.image.disk')
@@ -75,7 +75,7 @@ public static function upgradeImageDiskConfigItem()
             ]);
     }
 
-    public static function hideSomeConfigItems()
+    private static function hideSomeConfigItems()
     {
         AppConfig::query()
             ->whereIn('key', [
diff --git a/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php b/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php
new file mode 100644
index 000000000..fb07f0e02
--- /dev/null
+++ b/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the MeEdu.
+ *
+ * (c) 杭州白书科技有限公司
+ */
+
+namespace App\Meedu\Core\UpgradeLog;
+
+use App\Meedu\ServiceV2\Models\AppConfig;
+
+class UpgradeV4912
+{
+
+    public static function handle()
+    {
+        self::deleteSomeConfigItems();
+        self::renameWechatLoginKeyName();
+    }
+
+    private static function deleteSomeConfigItems()
+    {
+        AppConfig::query()
+            ->whereIn('key', [
+                'meedu.mp_wechat.enabled_scan_login',
+                'meedu.mp_wechat.scan_login_alert',
+            ])
+            ->delete();
+    }
+
+    private static function renameWechatLoginKeyName()
+    {
+        AppConfig::query()
+            ->where('key', 'meedu.mp_wechat.enabled_oauth_login')
+            ->update(['name' => '启动微信登录']);
+    }
+
+}
diff --git a/xyz.meedu.api/app/Meedu/MeEdu.php b/xyz.meedu.api/app/Meedu/MeEdu.php
index 80f66b1ea..9068c6378 100644
--- a/xyz.meedu.api/app/Meedu/MeEdu.php
+++ b/xyz.meedu.api/app/Meedu/MeEdu.php
@@ -10,5 +10,5 @@
 
 class MeEdu
 {
-    const VERSION = 'v4.9.11';
+    const VERSION = 'v4.9.12';
 }
diff --git a/xyz.meedu.api/app/Providers/HooksRegisterProvider.php b/xyz.meedu.api/app/Providers/HooksRegisterProvider.php
index 06f11456d..a32559838 100644
--- a/xyz.meedu.api/app/Providers/HooksRegisterProvider.php
+++ b/xyz.meedu.api/app/Providers/HooksRegisterProvider.php
@@ -9,9 +9,6 @@
 namespace App\Providers;
 
 use App\Meedu\Hooks\HookContainer;
-use App\Hooks\MpWechatSubscribeHook;
-use App\Hooks\MpWechatScanEvtSubHook;
-use App\Hooks\MpWechatMessageReplyHook;
 use Illuminate\Support\ServiceProvider;
 use App\Hooks\ViewBlock\Data\VodV1DataHook;
 use App\Meedu\Hooks\Constant\PositionConstant;
@@ -19,11 +16,6 @@
 class HooksRegisterProvider extends ServiceProvider
 {
     protected $hooks = [
-        PositionConstant::MP_WECHAT_RECEIVER_MESSAGE => [
-            MpWechatSubscribeHook::class,
-            MpWechatMessageReplyHook::class,
-            MpWechatScanEvtSubHook::class,
-        ],
         PositionConstant::VIEW_BLOCK_DATA_RENDER => [
             VodV1DataHook::class,
         ],
diff --git a/xyz.meedu.api/database/seeders/AppConfigSeeder.php b/xyz.meedu.api/database/seeders/AppConfigSeeder.php
index 1992fcf2d..b7be7ef39 100644
--- a/xyz.meedu.api/database/seeders/AppConfigSeeder.php
+++ b/xyz.meedu.api/database/seeders/AppConfigSeeder.php
@@ -1016,28 +1016,12 @@ public function run()
             ],
             [
                 'group' => '微信公众号',
-                'name' => '启用授权登录',
+                'name' => '启动微信登录',
                 'field_type' => 'switch',
                 'sort' => 6,
                 'key' => 'meedu.mp_wechat.enabled_oauth_login',
                 'value' => 0,
             ],
-            [
-                'group' => '微信公众号',
-                'name' => '启用PC扫码登录',
-                'field_type' => 'switch',
-                'sort' => 7,
-                'key' => 'meedu.mp_wechat.enabled_scan_login',
-                'value' => 0,
-            ],
-            [
-                'group' => '微信公众号',
-                'name' => '扫码登录成功回复信息',
-                'field_type' => 'textarea',
-                'sort' => 7,
-                'key' => 'meedu.mp_wechat.scan_login_alert',
-                'value' => '',
-            ],
             [
                 'group' => '微信公众号',
                 'name' => '启用微信分享',
diff --git a/xyz.meedu.api/routes/frontend-v3.php b/xyz.meedu.api/routes/frontend-v3.php
index 6caef2d38..377146688 100644
--- a/xyz.meedu.api/routes/frontend-v3.php
+++ b/xyz.meedu.api/routes/frontend-v3.php
@@ -19,12 +19,8 @@
 Route::post('/auth/login/wechat-scan/url', 'WechatScanLoginController@getLoginUrl');
 Route::get('/auth/login/wechat-scan/query', 'WechatScanLoginController@query');
 
-Route::get('/auth/login/wechat/scan', 'LoginController@wechatScan');
-Route::get('/auth/login/wechat/scan/query', 'LoginController@wechatScanQuery');
-
 Route::post('/auth/login/code', 'LoginController@loginByCode');
 Route::post('/auth/register/withSocialite', 'LoginController@registerWithSocialite');
-Route::post('/auth/register/withWechatScan', 'LoginController@registerWithWechatScan');
 
 Route::get('/course/attach-download', 'CourseController@attachDownloadDirect')->name('course.attach.download.direct');
 

From c87b1c1c2dfc84876852c144995708cbbdc83ae9 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Sun, 3 Nov 2024 14:56:29 +0800
Subject: [PATCH 19/40] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=B6=88=E6=81=AF=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=92=8C=E8=8F=9C=E5=8D=95=E7=BC=96=E8=BE=91=E7=AD=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Backend/Api/V1/MpWechatController.php     |  65 ---------
 .../Api/V1/MpWechatMessageReplyController.php | 133 ------------------
 .../Meedu/Core/UpgradeLog/UpgradeV4912.php    |  17 +++
 .../Interfaces/MpWechatServiceInterface.php   |  17 ---
 .../Other/Models/MpWechatMessageReply.php     |  27 ----
 .../OtherServiceRegisterProvider.php          |   3 -
 .../Other/Services/MpWechatService.php        |  84 -----------
 ...5_create_mp_wechat_message_reply_table.php |  19 +--
 .../seeders/AdministratorPermissionSeeder.php |  51 -------
 xyz.meedu.api/routes/backend-v1.php           |  19 ---
 .../Services/Other/MpWechatServiceTest.php    | 105 --------------
 11 files changed, 18 insertions(+), 522 deletions(-)
 delete mode 100644 xyz.meedu.api/app/Http/Controllers/Backend/Api/V1/MpWechatController.php
 delete mode 100644 xyz.meedu.api/app/Http/Controllers/Backend/Api/V1/MpWechatMessageReplyController.php
 delete mode 100644 xyz.meedu.api/app/Services/Other/Interfaces/MpWechatServiceInterface.php
 delete mode 100644 xyz.meedu.api/app/Services/Other/Models/MpWechatMessageReply.php
 delete mode 100644 xyz.meedu.api/app/Services/Other/Services/MpWechatService.php
 delete mode 100644 xyz.meedu.api/tests/Services/Other/MpWechatServiceTest.php

diff --git a/xyz.meedu.api/app/Http/Controllers/Backend/Api/V1/MpWechatController.php b/xyz.meedu.api/app/Http/Controllers/Backend/Api/V1/MpWechatController.php
deleted file mode 100644
index 4306f830e..000000000
--- a/xyz.meedu.api/app/Http/Controllers/Backend/Api/V1/MpWechatController.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Http\Controllers\Backend\Api\V1;
-
-use App\Meedu\Wechat;
-use Illuminate\Http\Request;
-use App\Models\AdministratorLog;
-
-class MpWechatController extends BaseController
-{
-    public function menu()
-    {
-        $mp = Wechat::getInstance();
-        $menu = $mp->menu->current();
-
-        AdministratorLog::storeLog(
-            AdministratorLog::MODULE_MP_MENU,
-            AdministratorLog::OPT_VIEW,
-            []
-        );
-
-        return $this->successData([
-            'menu' => $menu,
-        ]);
-    }
-
-    public function menuUpdate(Request $request)
-    {
-        $menu = $request->input('menu');
-        if ($menu) {
-            $response = Wechat::getInstance()->menu->create($menu['button']);
-            $errCode = $response['errcode'] ?? 1001;
-            if ($errCode !== 0) {
-                return $this->error($response['errmsg']);
-            }
-        }
-
-        AdministratorLog::storeLog(
-            AdministratorLog::MODULE_MP_MENU,
-            AdministratorLog::OPT_UPDATE,
-            $menu
-        );
-
-        return $this->success();
-    }
-
-    public function menuEmpty()
-    {
-        Wechat::getInstance()->menu->delete();
-
-        AdministratorLog::storeLog(
-            AdministratorLog::MODULE_MP_MENU,
-            AdministratorLog::OPT_DESTROY,
-            []
-        );
-
-        return $this->success();
-    }
-}
diff --git a/xyz.meedu.api/app/Http/Controllers/Backend/Api/V1/MpWechatMessageReplyController.php b/xyz.meedu.api/app/Http/Controllers/Backend/Api/V1/MpWechatMessageReplyController.php
deleted file mode 100644
index c9f77d96c..000000000
--- a/xyz.meedu.api/app/Http/Controllers/Backend/Api/V1/MpWechatMessageReplyController.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Http\Controllers\Backend\Api\V1;
-
-use Illuminate\Support\Arr;
-use Illuminate\Http\Request;
-use App\Models\AdministratorLog;
-use App\Services\Other\Models\MpWechatMessageReply;
-use App\Http\Requests\Backend\MpWechatMessageReplyRequest;
-
-class MpWechatMessageReplyController extends BaseController
-{
-    public function index(Request $request)
-    {
-        $type = $request->input('type');
-        $keywords = $request->input('keywords');
-
-        $data = MpWechatMessageReply::query()
-            ->when($type, function ($query) use ($type) {
-                $query->where('type', $type);
-            })
-            ->when($keywords, function ($query) use ($keywords) {
-                $query->orWhere('rule', 'like', '%' . $keywords . '%')
-                    ->orWhere('event_key', 'like', '%' . $keywords . '%');
-            })
-            ->orderByDesc('id')
-            ->paginate($request->input('size', 10));
-
-        AdministratorLog::storeLog(
-            AdministratorLog::MODULE_MP_MESSAGE,
-            AdministratorLog::OPT_VIEW,
-            compact('type', 'keywords')
-        );
-
-        return $this->successData([
-            'data' => $data,
-        ]);
-    }
-
-    public function create()
-    {
-        $types = [
-            [
-                'id' => 'text',
-                'name' => __('文本消息'),
-            ],
-            [
-                'id' => 'event',
-                'name' => __('事件'),
-            ]
-        ];
-
-        return $this->successData([
-            'types' => $types,
-        ]);
-    }
-
-    public function store(MpWechatMessageReplyRequest $request)
-    {
-        $data = $request->filldata();
-        if ($data['type'] === MpWechatMessageReply::TYPE_TEXT && $data['rule']) {
-            try {
-                preg_match('#' . $data['rule'] . '#', 'test');
-            } catch (\Exception $e) {
-                return $this->error(__('无效规则'));
-            }
-        }
-        MpWechatMessageReply::create($data);
-
-        AdministratorLog::storeLog(
-            AdministratorLog::MODULE_MP_MESSAGE,
-            AdministratorLog::OPT_STORE,
-            $data
-        );
-
-        return $this->success();
-    }
-
-    public function edit($id)
-    {
-        $data = MpWechatMessageReply::query()->where('id', $id)->firstOrFail();
-
-        AdministratorLog::storeLog(
-            AdministratorLog::MODULE_MP_MESSAGE,
-            AdministratorLog::OPT_VIEW,
-            compact('id')
-        );
-
-        return $this->successData([
-            'data' => $data,
-        ]);
-    }
-
-    public function update(MpWechatMessageReplyRequest $request, $id)
-    {
-        $data = $request->filldata();
-        if ($data['type'] === MpWechatMessageReply::TYPE_TEXT && $data['rule']) {
-            try {
-                preg_match('#' . $data['rule'] . '#', 'test');
-            } catch (\Exception $e) {
-                return $this->error(__('无效规则'));
-            }
-        }
-        $message = MpWechatMessageReply::query()->where('id', $id)->firstOrFail();
-        AdministratorLog::storeLogDiff(
-            AdministratorLog::MODULE_MP_MESSAGE,
-            AdministratorLog::OPT_UPDATE,
-            $data,
-            Arr::only($message->toArray(), [
-                'type', 'event_type', 'event_key', 'rule', 'reply_content',
-            ])
-        );
-        $message->fill($data)->save();
-        return $this->success();
-    }
-
-    public function destroy($id)
-    {
-        MpWechatMessageReply::destroy($id);
-        AdministratorLog::storeLog(
-            AdministratorLog::MODULE_MP_MESSAGE,
-            AdministratorLog::OPT_DESTROY,
-            compact('id')
-        );
-        return $this->success();
-    }
-}
diff --git a/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php b/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php
index fb07f0e02..68f8aafe1 100644
--- a/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php
+++ b/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php
@@ -8,6 +8,7 @@
 
 namespace App\Meedu\Core\UpgradeLog;
 
+use App\Models\AdministratorPermission;
 use App\Meedu\ServiceV2\Models\AppConfig;
 
 class UpgradeV4912
@@ -17,6 +18,22 @@ public static function handle()
     {
         self::deleteSomeConfigItems();
         self::renameWechatLoginKeyName();
+        self::deleteSomePermissions();
+    }
+
+    private static function deleteSomePermissions()
+    {
+        AdministratorPermission::query()
+            ->whereIn('slug', [
+                'mpWechatMessageReply',
+                'mpWechatMessageReply.store',
+                'mpWechatMessageReply.update',
+                'mpWechatMessageReply.destroy',
+                'mpWechat.menu',
+                'mpWechat.menu.update',
+                'mpWechat.menu.empty',
+            ])
+            ->delete();
     }
 
     private static function deleteSomeConfigItems()
diff --git a/xyz.meedu.api/app/Services/Other/Interfaces/MpWechatServiceInterface.php b/xyz.meedu.api/app/Services/Other/Interfaces/MpWechatServiceInterface.php
deleted file mode 100644
index a84aba113..000000000
--- a/xyz.meedu.api/app/Services/Other/Interfaces/MpWechatServiceInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Services\Other\Interfaces;
-
-interface MpWechatServiceInterface
-{
-
-    public function textMessageReplyFind(string $text): string;
-
-    public function eventMessageReplyFind(string $event, $eventKey = ''): string;
-}
diff --git a/xyz.meedu.api/app/Services/Other/Models/MpWechatMessageReply.php b/xyz.meedu.api/app/Services/Other/Models/MpWechatMessageReply.php
deleted file mode 100644
index c762b6092..000000000
--- a/xyz.meedu.api/app/Services/Other/Models/MpWechatMessageReply.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Services\Other\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class MpWechatMessageReply extends Model
-{
-    use SoftDeletes;
-
-    public const TYPE_TEXT = 'text';
-    public const TYPE_EVENT = 'event';
-
-    protected $table = 'mp_wechat_message_reply';
-
-    protected $fillable = [
-        'type', 'event_type', 'event_key', 'rule', 'reply_content',
-        'hit_times', 'last_hit_at',
-    ];
-}
diff --git a/xyz.meedu.api/app/Services/Other/Providers/OtherServiceRegisterProvider.php b/xyz.meedu.api/app/Services/Other/Providers/OtherServiceRegisterProvider.php
index 0041dd8eb..c602d5c9e 100644
--- a/xyz.meedu.api/app/Services/Other/Providers/OtherServiceRegisterProvider.php
+++ b/xyz.meedu.api/app/Services/Other/Providers/OtherServiceRegisterProvider.php
@@ -13,7 +13,6 @@
 use App\Services\Other\Services\SmsService;
 use App\Services\Other\Services\LinkService;
 use App\Services\Other\Services\SliderService;
-use App\Services\Other\Services\MpWechatService;
 use App\Services\Other\Services\ViewBlockService;
 use App\Services\Other\Services\AnnouncementService;
 use App\Services\Other\Services\SearchRecordService;
@@ -21,7 +20,6 @@
 use App\Services\Other\Interfaces\SmsServiceInterface;
 use App\Services\Other\Interfaces\LinkServiceInterface;
 use App\Services\Other\Interfaces\SliderServiceInterface;
-use App\Services\Other\Interfaces\MpWechatServiceInterface;
 use App\Services\Other\Interfaces\ViewBlockServiceInterface;
 use App\Services\Other\Interfaces\AnnouncementServiceInterface;
 use App\Services\Other\Interfaces\SearchRecordServiceInterface;
@@ -35,7 +33,6 @@ public function register()
         $this->app->instance(LinkServiceInterface::class, $this->app->make(LinkService::class));
         $this->app->instance(SmsServiceInterface::class, $this->app->make(SmsService::class));
         $this->app->instance(SliderServiceInterface::class, $this->app->make(SliderService::class));
-        $this->app->instance(MpWechatServiceInterface::class, $this->app->make(MpWechatService::class));
         $this->app->instance(ViewBlockServiceInterface::class, $this->app->make(ViewBlockService::class));
         $this->app->instance(SearchRecordServiceInterface::class, $this->app->make(SearchRecordService::class));
     }
diff --git a/xyz.meedu.api/app/Services/Other/Services/MpWechatService.php b/xyz.meedu.api/app/Services/Other/Services/MpWechatService.php
deleted file mode 100644
index 297b3be3b..000000000
--- a/xyz.meedu.api/app/Services/Other/Services/MpWechatService.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Services\Other\Services;
-
-use App\Services\Other\Models\MpWechatMessageReply;
-use App\Services\Other\Interfaces\MpWechatServiceInterface;
-
-class MpWechatService implements MpWechatServiceInterface
-{
-
-    /**
-     * 获取文本消息匹配的回复内容
-     * @param string $text
-     * @return string
-     */
-    public function textMessageReplyFind(string $text): string
-    {
-        $messages = MpWechatMessageReply::query()->where('type', MpWechatMessageReply::TYPE_TEXT)->select(['id', 'rule'])->get();
-        $id = 0;
-        foreach ($messages as $message) {
-            $rule = $message['rule'] ?? '';
-            if (!$rule) {
-                continue;
-            }
-
-            if (preg_match('#' . $rule . '#', $text)) {
-                $id = $message['id'];
-                break;
-            }
-        }
-
-        $message = MpWechatMessageReply::query()->where('id', $id)->first();
-        return $message['reply_content'] ?? '';
-    }
-
-    /**
-     * 获取事件的回复内容
-     * @param string $event
-     * @param mixed $eventKey
-     * @return string
-     */
-    public function eventMessageReplyFind(string $event, $eventKey = ''): string
-    {
-        $messages = MpWechatMessageReply::query()
-            ->where('type', MpWechatMessageReply::TYPE_EVENT)
-            ->where('event_type', $event)
-            ->orderByDesc('id')
-            ->get();
-
-        if ($messages->isEmpty()) {
-            return '';
-        }
-
-        $content = '';
-
-        if ($eventKey) {
-            foreach ($messages as $message) {
-                if (!$message['event_key']) {
-                    continue;
-                }
-
-                if (preg_match('#' . $message['event_key'] . '#us', $eventKey)) {
-                    $content = $message['reply_content'];
-                    break;
-                }
-            }
-        } else {
-            foreach ($messages as $message) {
-                if (!$message['event_key']) {
-                    $content = $message['reply_content'];
-                    break;
-                }
-            }
-        }
-
-        return $content;
-    }
-}
diff --git a/xyz.meedu.api/database/migrations/2020_09_04_130615_create_mp_wechat_message_reply_table.php b/xyz.meedu.api/database/migrations/2020_09_04_130615_create_mp_wechat_message_reply_table.php
index b968fe89b..d8d854a54 100644
--- a/xyz.meedu.api/database/migrations/2020_09_04_130615_create_mp_wechat_message_reply_table.php
+++ b/xyz.meedu.api/database/migrations/2020_09_04_130615_create_mp_wechat_message_reply_table.php
@@ -7,7 +7,6 @@
  */
 
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
 class CreateMpWechatMessageReplyTable extends Migration
@@ -19,23 +18,7 @@ class CreateMpWechatMessageReplyTable extends Migration
      */
     public function up()
     {
-        Schema::create('mp_wechat_message_reply', function (Blueprint $table) {
-            $table->bigIncrements('id');
-
-            $table->string('type', 32)->default('')->comment('消息类型');
-            $table->string('event_type', 32)->default('')->comment('事件类型[可选]');
-            $table->string('event_key')->default('')->comment('事件key[可选]');
-            $table->string('rule', 255)->default('')->comment('匹配规则');
-            $table->string('reply_content', 5120)->default('')->comment('回复内容');
-
-            $table->integer('hit_times')->default(0)->comment('命中次数');
-            $table->timestamp('last_hit_at')->nullable(true)->default(null)->comment('最后一次命中时间');
-
-            $table->timestamps();
-            $table->softDeletes();
-
-            $table->engine = 'InnoDB';
-        });
+        // 4.9.12版本删除此相关功能
     }
 
     /**
diff --git a/xyz.meedu.api/database/seeders/AdministratorPermissionSeeder.php b/xyz.meedu.api/database/seeders/AdministratorPermissionSeeder.php
index 2bdd7c65f..ec73be934 100644
--- a/xyz.meedu.api/database/seeders/AdministratorPermissionSeeder.php
+++ b/xyz.meedu.api/database/seeders/AdministratorPermissionSeeder.php
@@ -681,57 +681,6 @@ public function run()
                 ],
             ],
 
-            // 微信公众号消息回复
-            [
-                'group_name' => '微信公众号',
-                'children' => [
-                    [
-                        'display_name' => '微信公众号-消息回复规则-列表',
-                        'slug' => 'mpWechatMessageReply',
-                        'method' => 'GET',
-                        'url' => 'mpWechatMessageReply',
-                    ],
-                    [
-                        'display_name' => '微信公众号-消息回复规则-添加',
-                        'slug' => 'mpWechatMessageReply.store',
-                        'method' => 'GET|POST',
-                        'url' => '(^mpWechatMessageReply$|^mpWechatMessageReply\/create$)',
-                    ],
-                    [
-                        'display_name' => '微信公众号-消息回复规则-编辑',
-                        'slug' => 'mpWechatMessageReply.update',
-                        'method' => 'GET|PUT',
-                        'url' => 'mpWechatMessageReply/\d+',
-                    ],
-                    [
-                        'display_name' => '微信公众号-消息回复规则-删除',
-                        'slug' => 'mpWechatMessageReply.destroy',
-                        'method' => 'DELETE',
-                        'url' => 'mpWechatMessageReply/\d+',
-                    ],
-
-                    // 公众号菜单
-                    [
-                        'display_name' => '微信公众号-菜单-查询',
-                        'slug' => 'mpWechat.menu',
-                        'method' => 'GET',
-                        'url' => 'mpWechat/menu',
-                    ],
-                    [
-                        'display_name' => '微信公众号-菜单-更新',
-                        'slug' => 'mpWechat.menu.update',
-                        'method' => 'PUT',
-                        'url' => 'mpWechat/menu',
-                    ],
-                    [
-                        'display_name' => '微信公众号-菜单-清空',
-                        'slug' => 'mpWechat.menu.empty',
-                        'method' => 'DELETE',
-                        'url' => 'mpWechat/menu',
-                    ],
-                ],
-            ],
-
             // 装修
             [
                 'group_name' => '装修',
diff --git a/xyz.meedu.api/routes/backend-v1.php b/xyz.meedu.api/routes/backend-v1.php
index 9872d1a36..28aab66dd 100644
--- a/xyz.meedu.api/routes/backend-v1.php
+++ b/xyz.meedu.api/routes/backend-v1.php
@@ -307,25 +307,6 @@
         Route::get('/courseWatchDuration', 'StatisticController@courseWatchDuration');
     });
 
-    // 微信公众号消息回复
-    Route::group(['prefix' => 'mpWechatMessageReply'], function () {
-        Route::get('/', 'MpWechatMessageReplyController@index');
-        Route::get('/create', 'MpWechatMessageReplyController@create');
-        Route::post('/', 'MpWechatMessageReplyController@store');
-        Route::get('/{id}', 'MpWechatMessageReplyController@edit');
-        Route::put('/{id}', 'MpWechatMessageReplyController@update');
-        Route::delete('/{id}', 'MpWechatMessageReplyController@destroy');
-    });
-
-    // 微信公众号
-    Route::group(['prefix' => 'mpWechat'], function () {
-        Route::group(['prefix' => 'menu'], function () {
-            Route::get('/', 'MpWechatController@menu');
-            Route::put('/', 'MpWechatController@menuUpdate');
-            Route::delete('/', 'MpWechatController@menuEmpty');
-        });
-    });
-
     // 装修
     Route::group(['prefix' => 'viewBlock'], function () {
         Route::get('/index', 'ViewBlockController@index');
diff --git a/xyz.meedu.api/tests/Services/Other/MpWechatServiceTest.php b/xyz.meedu.api/tests/Services/Other/MpWechatServiceTest.php
deleted file mode 100644
index fd712a69e..000000000
--- a/xyz.meedu.api/tests/Services/Other/MpWechatServiceTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace Tests\Services\Other;
-
-use Tests\TestCase;
-use App\Services\Other\Models\MpWechatMessageReply;
-use App\Services\Other\Interfaces\MpWechatServiceInterface;
-
-class MpWechatServiceTest extends TestCase
-{
-
-    /**
-     * @var MpWechatServiceInterface
-     */
-    protected $service;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->service = $this->app->make(MpWechatServiceInterface::class);
-    }
-
-    public function test_textMessageReplyFind()
-    {
-        MpWechatMessageReply::create([
-            'type' => MpWechatMessageReply::TYPE_TEXT,
-            'rule' => 'hello',
-            'reply_content' => '你好',
-        ]);
-
-        $content = $this->service->textMessageReplyFind('hello');
-        $this->assertEquals('你好', $content);
-
-        // 支持正则
-        $content = $this->service->textMessageReplyFind('hello1');
-        $this->assertEquals('你好', $content);
-
-        $content = $this->service->textMessageReplyFind('world');
-        $this->assertEquals('', $content);
-    }
-
-    public function test_eventMessageReplyFind()
-    {
-        MpWechatMessageReply::create([
-            'type' => MpWechatMessageReply::TYPE_EVENT,
-            'event_type' => 'subscribe',
-            'event_key' => '',
-            'rule' => '',
-            'reply_content' => '欢迎关注',
-        ]);
-
-        $content = $this->service->eventMessageReplyFind('subscribe');
-        $this->assertEquals('欢迎关注', $content);
-    }
-
-    public function test_eventMessageReplyFind_with_repeat()
-    {
-        // 重复的创建会读取第一条数据
-
-        MpWechatMessageReply::create([
-            'type' => MpWechatMessageReply::TYPE_EVENT,
-            'event_type' => 'subscribe',
-            'event_key' => '',
-            'rule' => '',
-            'reply_content' => '欢迎关注1',
-        ]);
-        MpWechatMessageReply::create([
-            'type' => MpWechatMessageReply::TYPE_EVENT,
-            'event_type' => 'subscribe',
-            'event_key' => '',
-            'rule' => '',
-            'reply_content' => '欢迎关注2',
-        ]);
-
-        $content = $this->service->eventMessageReplyFind('subscribe');
-        $this->assertEquals('欢迎关注2', $content);
-    }
-
-    public function test_eventMessageReplyFind_with_eventKey()
-    {
-        MpWechatMessageReply::create([
-            'type' => MpWechatMessageReply::TYPE_EVENT,
-            'event_type' => 'subscribe',
-            'event_key' => '',
-            'rule' => '',
-            'reply_content' => '欢迎关注1',
-        ]);
-        MpWechatMessageReply::create([
-            'type' => MpWechatMessageReply::TYPE_EVENT,
-            'event_type' => 'subscribe',
-            'event_key' => 'qrcode',
-            'rule' => '',
-            'reply_content' => '欢迎关注2',
-        ]);
-
-        $content = $this->service->eventMessageReplyFind('subscribe', 'qrcode_1');
-        $this->assertEquals('欢迎关注2', $content);
-    }
-}

From 19b9ac998510eb09817d723142db2d485d2fcedb Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Sun, 3 Nov 2024 14:57:46 +0800
Subject: [PATCH 20/40] changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc9f2cf34..9f399c793 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 版本 4.9.12
+
+## 优化
+
+- 优化:[API]重构微信公众号的扫码登录
+- 优化:[API]删除微信公众号消息回复
+- 优化:[API]删除微信公众号菜单编辑
+
 # 版本 4.9.11
 
 ## 新增

From bed17a98c8789d2ce084b96b3e62e9fa68b88f06 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Sun, 3 Nov 2024 15:05:30 +0800
Subject: [PATCH 21/40] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/Api/V3/WechatScanLoginController.php    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php b/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
index 8784d0901..6fe5756f7 100644
--- a/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
+++ b/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
@@ -37,14 +37,15 @@ public function index(ConfigServiceInterface $configService, Request $request, W
         }
 
         $key = $request->input('key');
-        if (!$key) {
+        $action = $request->input('action');
+        if (!$key || !$action || !in_array($action, ['login', 'bind'])) {
             return $this->error(__('参数错误'));
         }
 
         $url = route('api.v3.wechat-scan-login.page') . '?' . http_build_query(['wechat_scan_key' => $key]);
 
         // 登录地址
-        $loginUrl = route('api.v3.login.wechat-oauth') . '?' . http_build_query(['s_url' => $url, 'f_url' => $url, 'action' => 'login']);
+        $loginUrl = route('api.v3.login.wechat-oauth') . '?' . http_build_query(['s_url' => $url, 'f_url' => $url, 'action' => $action]);
         // 网站名
         $appName = $configService->appName();
 

From 040b52f1f57fbc6f98d4bbb8589f70738d0420f3 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Sun, 3 Nov 2024 15:24:17 +0800
Subject: [PATCH 22/40] =?UTF-8?q?=E5=88=A0=E9=99=A4v2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=9A=84=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E3=80=81=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E6=8E=88=E6=9D=83=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/app/Bus/WechatBindBus.php       |  67 ---------
 xyz.meedu.api/app/Constant/CacheConstant.php  |  17 ---
 .../Controllers/Api/V2/LoginController.php    | 131 +-----------------
 .../Controllers/Api/V2/MemberController.php   |  90 +-----------
 xyz.meedu.api/routes/frontend-v2.php          |  14 +-
 .../tests/Unit/Bus/WechatBindBusTest.php      | 120 ----------------
 6 files changed, 3 insertions(+), 436 deletions(-)
 delete mode 100644 xyz.meedu.api/app/Bus/WechatBindBus.php
 delete mode 100644 xyz.meedu.api/tests/Unit/Bus/WechatBindBusTest.php

diff --git a/xyz.meedu.api/app/Bus/WechatBindBus.php b/xyz.meedu.api/app/Bus/WechatBindBus.php
deleted file mode 100644
index a9ad7fb49..000000000
--- a/xyz.meedu.api/app/Bus/WechatBindBus.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Bus;
-
-use Illuminate\Support\Str;
-use App\Businesses\BusinessState;
-use App\Constant\FrontendConstant;
-use App\Exceptions\ServiceException;
-use App\Services\Member\Interfaces\SocialiteServiceInterface;
-
-class WechatBindBus
-{
-    public const PREFIX = 'bind_';
-
-    protected $bus;
-
-    public function __construct(BusinessState $businessState)
-    {
-        $this->bus = $businessState;
-    }
-
-    public function isBind($code)
-    {
-        return Str::startsWith($code, self::PREFIX);
-    }
-
-    public function userId($code): int
-    {
-        $rows = explode('_', str_replace(self::PREFIX, '', $code));
-        return (int)($rows[0] ?? 0);
-    }
-
-    public function qrcode(int $userId)
-    {
-        $code = $this->code($userId);
-        $image = wechat_qrcode_image($code);
-        return compact('code', 'image');
-    }
-
-    public function code(int $userId): string
-    {
-        return sprintf('%s%d_%s', self::PREFIX, $userId, Str::random(5));
-    }
-
-    public function handle(string $code, string $appId, array $userData = [])
-    {
-        $userId = $this->userId($code);
-        if (!$userId) {
-            throw new ServiceException(__('参数错误'));
-        }
-
-        $this->bus->socialiteBindCheck($userId, FrontendConstant::WECHAT_LOGIN_SIGN, $appId);
-
-        /**
-         * @var SocialiteServiceInterface $socialiteService
-         */
-        $socialiteService = app()->make(SocialiteServiceInterface::class);
-
-        $socialiteService->bindApp($userId, FrontendConstant::WECHAT_LOGIN_SIGN, $appId, $userData);
-    }
-}
diff --git a/xyz.meedu.api/app/Constant/CacheConstant.php b/xyz.meedu.api/app/Constant/CacheConstant.php
index f3ecd319d..ab2907773 100644
--- a/xyz.meedu.api/app/Constant/CacheConstant.php
+++ b/xyz.meedu.api/app/Constant/CacheConstant.php
@@ -144,27 +144,10 @@ class CacheConstant
         'expire' => -1,
     ];
 
-    // 微信公众号扫码登录
-    public const WECHAT_SCAN_LOGIN = [
-        'name' => self::PREFIX_C . 'wechat:s:l:%s',
-        'expire' => 3600, //1小时
-    ];
-
 
     // 社交登录
     public const USER_SOCIALITE_LOGIN = [
         'name' => self::PREFIX_C . 'socialite:login:%s',
         'expire' => 600, //10分钟
     ];
-
-    // 微信公众号扫码登录/绑定
-    public const WECHAT_SCAN = [
-        'name' => self::PREFIX_C . 'wechat:scan:%s',
-        'expire' => 3600, //1小时
-    ];
-
-    public const WECHAT_SCAN_USER = [
-        'name' => self::PREFIX_C . 'wechat:scan:user:%s',
-        'expire' => 3600, //1小时
-    ];
 }
diff --git a/xyz.meedu.api/app/Http/Controllers/Api/V2/LoginController.php b/xyz.meedu.api/app/Http/Controllers/Api/V2/LoginController.php
index af609a087..9c548fc63 100644
--- a/xyz.meedu.api/app/Http/Controllers/Api/V2/LoginController.php
+++ b/xyz.meedu.api/app/Http/Controllers/Api/V2/LoginController.php
@@ -9,12 +9,8 @@
 namespace App\Http\Controllers\Api\V2;
 
 use App\Bus\AuthBus;
-use App\Meedu\Wechat;
-use Illuminate\Support\Str;
 use Illuminate\Http\Request;
-use App\Constant\CacheConstant;
 use App\Events\UserLogoutEvent;
-use App\Businesses\BusinessState;
 use App\Constant\FrontendConstant;
 use App\Exceptions\ServiceException;
 use Illuminate\Support\Facades\Auth;
@@ -128,7 +124,7 @@ public function mobileLogin(MobileLoginRequest $request)
      * @return mixed
      * @throws ServiceException
      */
-    protected function token($user)
+    private function token($user)
     {
         if ((int)$user['is_lock'] === 1) {
             throw new ServiceException(__('账号已被锁定'));
@@ -142,64 +138,6 @@ protected function token($user)
         return $authBus->tokenLogin($user['id'], get_platform());
     }
 
-    /**
-     * @api {get} /api/v2/login/wechat/oauth 微信公众号授权登录[重定向]
-     * @apiGroup Auth
-     * @apiName WechatOauth
-     * @apiVersion v2.0.0
-     * @apiDescription 登录成功之后会在success_redirect中携带token返回
-     *
-     * @apiParam {String} success_redirect 成功之后的跳转URL(需要urlencode)
-     * @apiParam {String} failed_redirect 失败之后跳转的URL(需要urlencode)
-     *
-     * @apiSuccess {Number} code 0成功,非0失败
-     * @apiSuccess {Object} data 数据
-     */
-    public function wechatLogin(Request $request)
-    {
-        $successRedirect = $request->input('success_redirect');
-        $failedRedirect = $request->input('failed_redirect');
-
-        if (!$successRedirect || !$failedRedirect) {
-            return $this->error(__('参数错误'));
-        }
-
-        $redirectUrl = route('api.v2.login.wechat.callback');
-        $redirectUrl = url_append_query($redirectUrl, ['s_url' => urlencode($successRedirect), 'f_url' => urlencode($failedRedirect)]);
-
-        return Wechat::getInstance()->oauth->redirect($redirectUrl);
-    }
-
-    // 微信公众号授权登录[回调]
-    public function wechatLoginCallback(Request $request, AuthBus $authBus)
-    {
-        $successRedirectUrl = urldecode($request->input('s_url', ''));
-        $failedRedirectUrl = urldecode($request->input('f_url'));
-
-        $user = Wechat::getInstance()->oauth->user();
-
-        if (!$user) {
-            return redirect(url_append_query($failedRedirectUrl, ['msg' => __('错误')]));
-        }
-
-        $originalData = $user['original'];
-
-        $openid = $originalData['openid'];
-        $unionId = $originalData['unionid'] ?? '';
-
-        $userId = $authBus->wechatLogin($openid, $unionId, $originalData);
-
-        $user = $this->userService->find($userId);
-
-        try {
-            $token = $this->token($user);
-
-            return redirect(url_append_query($successRedirectUrl, ['token' => $token]));
-        } catch (ServiceException $e) {
-            return redirect(url_append_query($failedRedirectUrl, ['msg' => $e->getMessage()]));
-        }
-    }
-
     /**
      * @api {get} /api/v2/login/socialite/{app} 社交APP登录[重定向]
      * @apiGroup Auth
@@ -271,73 +209,6 @@ public function socialiteLoginCallback(Request $request, $app)
         }
     }
 
-    /**
-     * @api {get} /api/v2/login/wechatScan 微信扫码登录[二维码]
-     * @apiGroup Auth
-     * @apiName LoginWechatScan
-     * @apiVersion v2.0.0
-     *
-     * @apiSuccess {Number} code 0成功,非0失败
-     * @apiSuccess {Object} data 数据
-     * @apiSuccess {String} data.code 随机值
-     * @apiSuccess {String} data.image 图片内容
-     */
-    public function wechatScan(BusinessState $businessState)
-    {
-        if (!$businessState->enabledMpScanLogin()) {
-            throw new ServiceException(__('未开启微信公众号扫码登录'));
-        }
-
-        // 生成登录二维码
-        $code = Str::random(10);
-        $image = wechat_qrcode_image($code);
-
-        return $this->data([
-            'code' => $code,
-            'image' => $image,
-        ]);
-    }
-
-    /**
-     * @api {get} /api/v2/login/wechatScan/query 微信扫码登录[结果查询]
-     * @apiGroup Auth
-     * @apiName LoginWechatScanQuery
-     * @apiVersion v2.0.0
-     *
-     * @apiParam {String} code 随机值
-     *
-     * @apiSuccess {Number} code 0成功,非0失败
-     * @apiSuccess {Object} data 数据
-     * @apiSuccess {Number} data.status 结果[1:登录成功,0:失败]
-     * @apiSuccess {String} data.token token[登录成功返回]
-     */
-    public function wechatScanQuery(Request $request, AuthBus $authBus)
-    {
-        $code = $request->input('code');
-        if (!$code) {
-            return $this->error(__('参数错误'));
-        }
-
-        $cacheKey = get_cache_key(CacheConstant::WECHAT_SCAN_LOGIN['name'], $code);
-        $userId = (int)$this->cacheService->pull($cacheKey);
-
-        if (!$userId) {
-            return $this->data(['status' => 0]);
-        }
-
-        $user = $this->userService->find($userId);
-        if ((int)$user['is_lock'] === 1) {
-            return $this->error(__('账号已被锁定'));
-        }
-
-        $token = $authBus->tokenLogin($userId, FrontendConstant::LOGIN_PLATFORM_PC);
-
-        return $this->data([
-            'status' => 1,
-            'token' => $token,
-        ]);
-    }
-
     /**
      * @api {post} /api/v2/logout 安全退出
      * @apiGroup Auth
diff --git a/xyz.meedu.api/app/Http/Controllers/Api/V2/MemberController.php b/xyz.meedu.api/app/Http/Controllers/Api/V2/MemberController.php
index dc71d1b78..fdbd3798a 100644
--- a/xyz.meedu.api/app/Http/Controllers/Api/V2/MemberController.php
+++ b/xyz.meedu.api/app/Http/Controllers/Api/V2/MemberController.php
@@ -9,8 +9,6 @@
 namespace App\Http\Controllers\Api\V2;
 
 use App\Meedu\Verify;
-use App\Meedu\Wechat;
-use App\Bus\WechatBindBus;
 use Illuminate\Http\Request;
 use App\Constant\ApiV2Constant;
 use App\Businesses\BusinessState;
@@ -682,7 +680,7 @@ public function credit1Records(Request $request, CreditServiceInterface $creditS
     }
 
     /**
-     * @api {post} /api/v2/member/verify 校验
+     * @api {post} /api/v2/member/verify 2FA校验
      * @apiGroup 用户
      * @apiName MemberVerify
      * @apiVersion v2.0.0
@@ -706,27 +704,6 @@ public function verify(Request $request, Verify $verify)
         return $this->data(['sign' => $verify->gen()]);
     }
 
-    /**
-     * @api {get} /api/v2/member/wechatScan/bind 微信扫码绑定[二维码]
-     * @apiGroup 用户
-     * @apiName MemberWechatBind
-     * @apiVersion v2.0.0
-     * @apiHeader Authorization Bearer+空格+token
-     *
-     * @apiSuccess {Number} code 0成功,非0失败
-     * @apiSuccess {Object} data 数据
-     * @apiSuccess {String} data.code 随机值
-     * @apiSuccess {String} data.image 图片内容
-     */
-    public function wechatScanBind(WechatBindBus $bus)
-    {
-        $data = $bus->qrcode($this->id());
-        return $this->data([
-            'code' => $data['code'],
-            'image' => $data['image'],
-        ]);
-    }
-
     /**
      * @api {delete} /api/v2/member/socialite/{app} 社交登录解绑
      * @apiGroup 用户
@@ -827,69 +804,4 @@ public function socialiteBind(SocialiteServiceInterface $socialiteService, Reque
             ->stateless()
             ->redirect();
     }
-
-    /**
-     * @api {get} /api/v2/member/wechatBind 微信公众号授权绑定[302重定向]
-     * @apiGroup 用户
-     * @apiName MemberWechatBind
-     * @apiVersion v2.0.0
-     *
-     * @apiParam {String} token 登录token
-     * @apiParam {String} redirect_url 绑定成功之后的跳转地址，需要urlEncode
-     */
-    public function wechatBind(Request $request)
-    {
-        $redirectUrl = urldecode($request->input('redirect_url'));
-        if (!$redirectUrl) {
-            return $this->error(__('参数错误'));
-        }
-
-        $callbackUrl = route('api.v2.wechatBind.callback');
-        $callbackUrl = url_append_query($callbackUrl, [
-            'redirect_url' => urlencode($redirectUrl),
-            'data' => encrypt([
-                // 有效期一个小时
-                'expired_at' => time() + 3600,
-                // 绑定的用户id
-                'user_id' => $this->id(),
-            ]),
-        ]);
-
-        return Wechat::getInstance()->oauth->redirect($callbackUrl);
-    }
-
-    public function wechatBindCallback(SocialiteServiceInterface $socialiteService, BusinessState $businessState, Request $request)
-    {
-        $app = FrontendConstant::WECHAT_LOGIN_SIGN;
-
-        $data = $request->input('data');
-        $redirectUrl = urldecode($request->input('redirect_url'));
-        if (!$data || !$redirectUrl) {
-            return $this->error(__('参数错误'));
-        }
-
-        $socialiteUser = Wechat::getInstance()->oauth->user();
-        if (!$socialiteUser) {
-            return redirect(url_append_query($redirectUrl, ['error' => __('系统错误')]));
-        }
-        $appId = $socialiteUser->getId();
-
-        try {
-            $data = decrypt($data);
-            if ($data['expired_at'] < time()) {
-                return redirect(url_append_query($redirectUrl, ['error' => __('已超时，请重新绑定')]));
-            }
-            $needBindUserId = (int)$data['user_id'];
-
-            $businessState->socialiteBindCheck($needBindUserId, $app, $appId);
-
-            $socialiteService->bindApp($needBindUserId, $app, $appId, $socialiteUser->toArray());
-
-            return redirect($redirectUrl);
-        } catch (ServiceException $e) {
-            return redirect(url_append_query($redirectUrl, ['error' => $e->getMessage()]));
-        } catch (\Exception $e) {
-            abort(500);
-        }
-    }
 }
diff --git a/xyz.meedu.api/routes/frontend-v2.php b/xyz.meedu.api/routes/frontend-v2.php
index f488f67cd..83b283498 100644
--- a/xyz.meedu.api/routes/frontend-v2.php
+++ b/xyz.meedu.api/routes/frontend-v2.php
@@ -17,12 +17,6 @@
 Route::post('/login/password', 'LoginController@passwordLogin');
 // 手机号登录
 Route::post('/login/mobile', 'LoginController@mobileLogin');
-// 微信公众号扫码登录
-Route::get('/login/wechatScan', 'LoginController@wechatScan');
-Route::get('/login/wechatScan/query', 'LoginController@wechatScanQuery');
-// 微信公众号授权登录
-Route::get('/login/wechat/oauth', 'LoginController@wechatLogin')->middleware(['deprecated.api']);
-Route::get('/login/wechat/oauth/callback', 'LoginController@wechatLoginCallback')->name('api.v2.login.wechat.callback');
 // 社交登录
 Route::get('/login/socialite/{app}', 'LoginController@socialiteLogin')->middleware(['deprecated.api']);
 Route::get('/login/socialite/{app}/callback', 'LoginController@socialiteLoginCallback')->name('api.v2.login.socialite.callback');
@@ -80,8 +74,6 @@
 // ViewBlock装修模块
 Route::get('/viewBlock/page/blocks', 'ViewBlockController@pageBlocks');
 
-// 微信公众号授权绑定回调
-Route::get('wechatBind/callback', 'MemberController@wechatBindCallback')->name('api.v2.wechatBind.callback')->middleware(['deprecated.api']);
 // 社交账号绑定回调
 Route::get('socialite/{app}/bind/callback', 'MemberController@socialiteBindCallback')->name('api.v2.socialite.bind.callback')->middleware(['deprecated.api']);
 
@@ -142,15 +134,11 @@
         Route::get('unreadNotificationCount', 'MemberController@unreadNotificationCount');
         // 积分明细
         Route::get('credit1Records', 'MemberController@credit1Records');
-        // 安全校验[手机号]
+        // 2FA校验
         Route::post('verify', 'MemberController@verify');
-        // 微信扫码登录绑定
-        Route::get('wechatScan/bind', 'MemberController@wechatScanBind');
         // 社交账号取消绑定
         Route::delete('socialite/{app}', 'MemberController@socialiteCancelBind');
         // 社交账号绑定
         Route::get('socialite/{app}', 'MemberController@socialiteBind')->middleware(['deprecated.api']);
-        // 微信公众号授权绑定
-        Route::get('wechatBind', 'MemberController@wechatBind')->middleware(['deprecated.api']);
     });
 });
diff --git a/xyz.meedu.api/tests/Unit/Bus/WechatBindBusTest.php b/xyz.meedu.api/tests/Unit/Bus/WechatBindBusTest.php
deleted file mode 100644
index d64b456b9..000000000
--- a/xyz.meedu.api/tests/Unit/Bus/WechatBindBusTest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace Tests\Unit\Bus;
-
-use Tests\TestCase;
-use App\Bus\WechatBindBus;
-use Illuminate\Support\Str;
-use App\Constant\FrontendConstant;
-use App\Exceptions\ServiceException;
-use App\Services\Member\Models\Socialite;
-
-class WechatBindBusTest extends TestCase
-{
-
-    /**
-     * @var WechatBindBus
-     */
-    protected $wechatBindBus;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-        $this->wechatBindBus = $this->app->make(WechatBindBus::class);
-    }
-
-    public function test_isBind()
-    {
-        $this->assertTrue($this->wechatBindBus->isBind('bind_123'));
-        $this->assertFalse($this->wechatBindBus->isBind('123'));
-    }
-
-    public function test_userId()
-    {
-        $this->assertEquals(1, $this->wechatBindBus->userId('bind_1'));
-        $this->assertEquals(0, $this->wechatBindBus->userId('bind_'));
-    }
-
-    public function test_code()
-    {
-        $code = $this->wechatBindBus->code(1234);
-        $this->assertEquals(1234, $this->wechatBindBus->userId($code));
-    }
-
-    public function test_qrcode()
-    {
-        config([
-            'meedu.mp_wechat.app_id' => env('WECHAT_MP_APP_ID', ''),
-            'meedu.mp_wechat.app_secret' => env('WECHAT_MP_APP_SECRET', ''),
-            'meedu.mp_wechat.token' => env('WECHAT_MP_TOKEN', ''),
-        ]);
-
-        $data = $this->wechatBindBus->qrcode(1);
-
-        $this->assertTrue(isset($data['code']));
-        $this->assertTrue(isset($data['image']));
-    }
-
-    public function test_handle_with_error_code()
-    {
-        $this->expectException(ServiceException::class);
-        $this->wechatBindBus->handle('bind', '123', []);
-    }
-
-    public function test_handle()
-    {
-        $userId = 123;
-
-        $code = $this->wechatBindBus->code($userId);
-
-        $appId = Str::random(10);
-        $this->wechatBindBus->handle($code, $appId, []);
-
-        $socialite = Socialite::query()
-            ->where('user_id', $userId)
-            ->where('app', FrontendConstant::WECHAT_LOGIN_SIGN)
-            ->firstOrFail();
-
-        $this->assertEquals($appId, $socialite['app_user_id']);
-    }
-
-    public function test_handle_with_has_bind()
-    {
-        $userId = 123;
-        $appId = Str::random(10);
-
-        Socialite::create([
-            'user_id' => $userId,
-            'app' => FrontendConstant::WECHAT_LOGIN_SIGN,
-            'app_user_id' => $appId,
-        ]);
-
-        $code = $this->wechatBindBus->code($userId);
-
-        $this->expectExceptionMessage(__('您已经绑定了该渠道的账号'));
-        $this->wechatBindBus->handle($code, $appId, []);
-    }
-
-    public function test_handle_with_other_bind()
-    {
-        $userId = 123;
-        $appId = Str::random(10);
-
-        Socialite::create([
-            'user_id' => $userId + 1,
-            'app' => FrontendConstant::WECHAT_LOGIN_SIGN,
-            'app_user_id' => $appId,
-        ]);
-
-        $code = $this->wechatBindBus->code($userId);
-
-        $this->expectExceptionMessage(__('当前渠道账号已绑定了其它账号'));
-        $this->wechatBindBus->handle($code, $appId, []);
-    }
-}

From 66e015e5e32d634f7b0f77ced28bcfe83b54547a Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 10:16:59 +0800
Subject: [PATCH 23/40] =?UTF-8?q?fixed:=20=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/app/Bus/WechatScanBusV2.php     |  5 +++--
 .../Controllers/Api/V2/OtherController.php    |  1 -
 .../Api/V3/WechatScanLoginController.php      | 19 ++++++++++---------
 .../ServiceV2/Services/ConfigService.php      |  5 -----
 .../Services/ConfigServiceInterface.php       |  2 --
 .../Interfaces/ConfigServiceInterface.php     |  4 ----
 .../Services/Base/Services/ConfigService.php  | 10 ----------
 .../tests/Unit/Bus/BusinessStateTest.php      |  9 ---------
 8 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/xyz.meedu.api/app/Bus/WechatScanBusV2.php b/xyz.meedu.api/app/Bus/WechatScanBusV2.php
index 686cfcda9..706267ea0 100644
--- a/xyz.meedu.api/app/Bus/WechatScanBusV2.php
+++ b/xyz.meedu.api/app/Bus/WechatScanBusV2.php
@@ -16,13 +16,14 @@ class WechatScanBusV2
 
     public const TTL = 300;
 
-    public function getLoginUrl(): array
+    public function getLoginUrl(string $action): array
     {
         $key = Str::random(20);
         Cache::put($this->cacheKey($key), 0, self::TTL);
         return [
-            'url' => route('api.v3.wechat-scan-login.page', ['key' => $key]),
+            'url' => route('api.v3.wechat-scan-login.page') . '?' . http_build_query(['key' => $key, 'action' => $action]),
             'expire' => time() + self::TTL,
+            'key' => $key,
         ];
     }
 
diff --git a/xyz.meedu.api/app/Http/Controllers/Api/V2/OtherController.php b/xyz.meedu.api/app/Http/Controllers/Api/V2/OtherController.php
index b5afea4b0..8ed412acf 100644
--- a/xyz.meedu.api/app/Http/Controllers/Api/V2/OtherController.php
+++ b/xyz.meedu.api/app/Http/Controllers/Api/V2/OtherController.php
@@ -125,7 +125,6 @@ public function config(Addons $addons, ConfigServiceInterface $configService, Li
             // 社交登录
             'socialites' => [
                 'qq' => $configService->getSocialiteQQLoginEnabled(),
-                'wechat_scan' => $configService->getSocialiteWechatScanLoginEnabled(),
                 'wechat_oauth' => $configService->getSocialiteWechatLoginEnabled(),
             ],
             // 积分奖励
diff --git a/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php b/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
index 6fe5756f7..ed726d129 100644
--- a/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
+++ b/xyz.meedu.api/app/Http/Controllers/Api/V3/WechatScanLoginController.php
@@ -36,8 +36,8 @@ public function index(ConfigServiceInterface $configService, Request $request, W
             return view('wechat_scan_login.success', compact('appName'));
         }
 
-        $key = $request->input('key');
-        $action = $request->input('action');
+        $key = $request->get('key');
+        $action = $request->get('action');
         if (!$key || !$action || !in_array($action, ['login', 'bind'])) {
             return $this->error(__('参数错误'));
         }
@@ -52,19 +52,20 @@ public function index(ConfigServiceInterface $configService, Request $request, W
         return view('wechat_scan_login.index', compact('appName', 'loginUrl'));
     }
 
-    public function getLoginUrl(WechatScanBusV2 $bus)
+    public function getLoginUrl(Request $request, WechatScanBusV2 $bus)
     {
-        return $this->data($bus->getLoginUrl());
+        $action = $request->get('action');
+        if (!$action || !in_array($action, ['bind', 'login'])) {
+            return $this->error(__('参数错误'));
+        }
+
+        return $this->data($bus->getLoginUrl($action));
     }
 
     public function query(Request $request, WechatScanBusV2 $bus)
     {
         $key = $request->input('key');
-        if (!$key) {
-            return $this->error(__('参数错误'));
-        }
-
-        if ($bus->isValid($key)) {
+        if (!$key || !$bus->isValid($key)) {
             return $this->error(__('参数错误'));
         }
 
diff --git a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
index 64956a696..fccbb9e09 100644
--- a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
+++ b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
@@ -48,11 +48,6 @@ public function isCloseDeprecatedApi(): bool
         return (bool)config('meedu.system.close_deprecated_api');
     }
 
-    public function getMpWechatScanLoginAlert(): string
-    {
-        return config('meedu.mp_wechat.scan_login_alert') ?? '';
-    }
-
     public function getTencentFaceConfig(): array
     {
         return config('tencent.face') ?? [];
diff --git a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigServiceInterface.php b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigServiceInterface.php
index de637427c..bbc6786d6 100644
--- a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigServiceInterface.php
+++ b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigServiceInterface.php
@@ -18,8 +18,6 @@ public function getLoginLimitRule(): int;
 
     public function isCloseDeprecatedApi(): bool;
 
-    public function getMpWechatScanLoginAlert(): string;
-
     public function getTencentFaceConfig(): array;
 
     public function enabledFaceVerify(): bool;
diff --git a/xyz.meedu.api/app/Services/Base/Interfaces/ConfigServiceInterface.php b/xyz.meedu.api/app/Services/Base/Interfaces/ConfigServiceInterface.php
index 4e5dfd53a..8b620466a 100644
--- a/xyz.meedu.api/app/Services/Base/Interfaces/ConfigServiceInterface.php
+++ b/xyz.meedu.api/app/Services/Base/Interfaces/ConfigServiceInterface.php
@@ -98,12 +98,8 @@ public function getMpWechatConfig(): array;
 
     public function getMemberRegisterSendVipConfig(): array;
 
-    public function getMpWechatScanLoginAlert(): string;
-
     public function getSocialiteQQLoginEnabled(): int;
 
-    public function getSocialiteWechatScanLoginEnabled(): int;
-
     public function getSocialiteWechatLoginEnabled(): int;
 
     public function getUrl(): string;
diff --git a/xyz.meedu.api/app/Services/Base/Services/ConfigService.php b/xyz.meedu.api/app/Services/Base/Services/ConfigService.php
index 7e8c812d7..b442b5f03 100644
--- a/xyz.meedu.api/app/Services/Base/Services/ConfigService.php
+++ b/xyz.meedu.api/app/Services/Base/Services/ConfigService.php
@@ -324,21 +324,11 @@ public function getMemberRegisterSendVipConfig(): array
         return config('meedu.member.register.vip') ?? [];
     }
 
-    public function getMpWechatScanLoginAlert(): string
-    {
-        return config('meedu.mp_wechat.scan_login_alert') ?? '';
-    }
-
     public function getSocialiteQQLoginEnabled(): int
     {
         return (int)config('meedu.member.socialite.qq.enabled');
     }
 
-    public function getSocialiteWechatScanLoginEnabled(): int
-    {
-        return (int)config('meedu.mp_wechat.enabled_scan_login');
-    }
-
     public function getSocialiteWechatLoginEnabled(): int
     {
         return (int)config('meedu.mp_wechat.enabled_oauth_login');
diff --git a/xyz.meedu.api/tests/Unit/Bus/BusinessStateTest.php b/xyz.meedu.api/tests/Unit/Bus/BusinessStateTest.php
index 9f2e59d8b..d6eecadc3 100644
--- a/xyz.meedu.api/tests/Unit/Bus/BusinessStateTest.php
+++ b/xyz.meedu.api/tests/Unit/Bus/BusinessStateTest.php
@@ -172,15 +172,6 @@ public function test_isEnabledMpOAuthLogin()
         $this->assertTrue($this->businessStatus->isEnabledMpOAuthLogin());
     }
 
-    public function test_enabledMpScanLogin()
-    {
-        //默认关闭
-        $this->assertFalse($this->businessStatus->enabledMpScanLogin());
-
-        config(['meedu.mp_wechat.enabled_scan_login' => 1]);
-        $this->assertTrue($this->businessStatus->enabledMpScanLogin());
-    }
-
     public function test_isBuyCourse_with_free_course()
     {
         $course = Course::factory()->create(['is_free' => 1]);

From 281b043f4bef1ec306a99fccd431dbae07395d76 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 10:30:32 +0800
Subject: [PATCH 24/40] =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/views/wechat_scan_login/index.blade.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xyz.meedu.api/resources/views/wechat_scan_login/index.blade.php b/xyz.meedu.api/resources/views/wechat_scan_login/index.blade.php
index ac3b41c19..3a5a2d7ac 100644
--- a/xyz.meedu.api/resources/views/wechat_scan_login/index.blade.php
+++ b/xyz.meedu.api/resources/views/wechat_scan_login/index.blade.php
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>微信公众号登录</title>
+    <title>微信账号授权登录</title>
     <style>
         * {
             box-sizing: border-box;
@@ -132,9 +132,9 @@
 </head>
 <body>
 <div class="container">
-    <h1>微信公众号登录</h1>
+    <h1>微信账号授权登录</h1>
     <p>使用您的微信账号登录</p>
-    <button onclick="handleLogin()" class="btn-wechat">微信登录</button>
+    <button onclick="handleLogin()" class="btn-wechat">立即登录</button>
     <div class="terms">
         <input type="checkbox" id="agree" required>
         <label for="agree">

From 243c37d646ebeaa168c4aaa8a4774a2f970b0885 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 10:32:54 +0800
Subject: [PATCH 25/40] =?UTF-8?q?fixed:=20=E5=BE=AE=E4=BF=A1=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E7=BD=91=E7=AB=99=E5=90=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
index fccbb9e09..5b68748f9 100644
--- a/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
+++ b/xyz.meedu.api/app/Meedu/ServiceV2/Services/ConfigService.php
@@ -139,7 +139,7 @@ public function updateTencentVodPlayKey(string $playKey): void
 
     public function appName(): string
     {
-        return config('meedu.system.app_name') ?? '';
+        return config('meedu.system.name') ?? '';
     }
 
 }

From 0deb6d57e5b2c12b55868a66c241615f8a673d6d Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 13:43:11 +0800
Subject: [PATCH 26/40] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin-login-dailog/index.module.scss     |  9 ++++-
 .../components/weixin-login-dailog/index.tsx  | 40 +++++++------------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss b/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
index 66ac7cb68..35335ceed 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
@@ -57,11 +57,18 @@
 
 .box {
   width: 100%;
-  margin-top: 30px;
+  margin-top: 16px;
   display: flex;
   flex-direction: column;
   align-items: center;
+
   .time {
+    font-size: 0.8rem;
+    margin-top: 16px;
     margin-bottom: 16px;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    padding: 5px 10px;
+    border-radius: 20px;
+    color: rgba(0,0,0,0.6);
   }
 }
diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index e343c5ba2..3aea56071 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { useDispatch } from "react-redux";
-import { useParams, useNavigate, useLocation } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router-dom";
 import styles from "./index.module.scss";
 import { Modal, QRCode } from "antd";
 import { user, login } from "../../api/index";
@@ -24,7 +24,6 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
   bindMobile,
 }) => {
   const result = new URLSearchParams(useLocation().search);
-  const params = useParams();
   const dispatch = useDispatch();
   const navigate = useNavigate();
   const pathname = useLocation().pathname;
@@ -38,7 +37,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
     min: "00",
     sec: "00",
   });
-  const [redirect, setRedirect] = useState(result.get("redirect"));
+  const [redirect] = useState(result.get("redirect"));
 
   useEffect(() => {
     if (open) {
@@ -181,28 +180,6 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
             </a>
           </div>
           <div className={styles["box"]}>
-            {!loading && !expired && qrode !== "" && (
-              <div className={styles["time"]}>
-                有效期：
-                {remainingTime.day !== 0 && (
-                  <span>
-                    {remainingTime.day}天{remainingTime.hr}时{remainingTime.min}
-                    分{remainingTime.sec}秒
-                  </span>
-                )}
-                {remainingTime.day === 0 && remainingTime.hr !== "00" && (
-                  <span>
-                    {remainingTime.hr}时{remainingTime.min}分{remainingTime.sec}
-                    秒
-                  </span>
-                )}
-                {remainingTime.day === 0 && remainingTime.hr === "00" && (
-                  <span>
-                    {remainingTime.min}分{remainingTime.sec}秒
-                  </span>
-                )}
-              </div>
-            )}
             {qrode !== "" && (
               <>
                 {expired ? (
@@ -230,6 +207,19 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
                 )}
               </>
             )}
+
+            {!loading &&
+            !expired &&
+            qrode !== "" &&
+            remainingTime.min !== "00" &&
+            remainingTime.sec !== "00" ? (
+              <div className={styles["time"]}>
+                有效期：
+                <span>
+                  {remainingTime.min}分{remainingTime.sec}秒
+                </span>
+              </div>
+            ) : null}
           </div>
         </Modal>
       ) : null}

From 019582678a0a9474ac7cb7a7dbaf825b47f1b477 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 14:12:41 +0800
Subject: [PATCH 27/40] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=AC=AC=E4=B8=80=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/public/install.php | 178 ++++++++++++++++++++++++-------
 1 file changed, 140 insertions(+), 38 deletions(-)

diff --git a/xyz.meedu.api/public/install.php b/xyz.meedu.api/public/install.php
index 9ade84b93..bdf989aeb 100644
--- a/xyz.meedu.api/public/install.php
+++ b/xyz.meedu.api/public/install.php
@@ -155,53 +155,155 @@ function is_https()
 
 if ($step === 0) {
     ?>
-    <!doctype html>
-    <html lang="en">
+    <!DOCTYPE html>
+    <html lang="zh-CN">
     <head>
         <meta charset="UTF-8">
-        <meta name="viewport"
-              content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-        <meta http-equiv="X-UA-Compatible" content="ie=edge">
-        <link crossorigin="anonymous"
-              integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
-              href="https://lib.baomitu.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>MeEdu安装程序</title>
+        <style>
+            body {
+                font-family: Arial, sans-serif;
+                background-color: #f3f4f6;
+                margin: 0;
+                padding: 20px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                min-height: 100vh;
+            }
+
+            .container {
+                background-color: white;
+                border-radius: 8px;
+                box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+                width: 100%;
+                max-width: 600px;
+                overflow: hidden;
+            }
+
+            header {
+                background-color: #f9fafb;
+                padding: 20px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+            }
+
+            .logo-title {
+                display: flex;
+                align-items: center;
+            }
+
+            .logo {
+                width: 40px;
+                height: 40px;
+                margin-right: 10px;
+            }
+
+            main {
+                padding: 20px;
+            }
+
+            h2 {
+                font-size: 1.125rem;
+                color: #374151;
+                margin-bottom: 1rem;
+            }
+
+            .check-list {
+                list-style: none;
+                padding: 0;
+            }
+            .check-item {
+                border-bottom: 1px solid #e5e7eb;
+                padding: 10px 0;
+            }
+            .check-item:last-child {
+                border-bottom: none;
+            }
+            .check-header {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 5px;
+            }
+            .check-name {
+                font-weight: bold;
+            }
+            .status {
+                width: 20px;
+                height: 20px;
+                border-radius: 50%;
+            }
+            .passed {
+                background-color: #10b981;
+            }
+            .failed {
+                background-color: #ef4444;
+            }
+            .check-description {
+                font-size: 0.875rem;
+                color: #6b7280;
+                margin-top: 5px;
+            }
+
+            footer {
+                background-color: #f9fafb;
+                padding: 20px;
+                text-align: right;
+            }
+
+            .next-button {
+                background-color: #3b82f6;
+                color: white;
+                border: none;
+                padding: 10px 20px;
+                border-radius: 4px;
+                cursor: pointer;
+                font-size: 1rem;
+                text-decoration: none;
+                outline: none;
+            }
+
+            .next-button:hover {
+                opacity: 0.8;
+            }
+
+            .next-button:disabled {
+                background-color: #9ca3af;
+                cursor: not-allowed;
+            }
+        </style>
     </head>
     <body>
     <div class="container">
-        <div class="row">
-            <div class="col-12 my-5">
+        <header>
+            <div class="logo-title">
                 <a href="https://meedu.vip/" target="_blank"><img src="/images/logo.png" height="40"></a>
             </div>
-            <div class="col-12 mb-5 text-center">
-                <h2>MeEdu 傻瓜安装程序</h2>
-            </div>
-            <div class="col-12">
-                <table class="table table-hover">
-                    <thead>
-                    <tr class="text-center">
-                        <th width="40%">要求</th>
-                        <th>状态</th>
-                        <th>说明</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php foreach ($requires as $require) { ?>
-                        <tr class="text-center">
-                            <td><?php echo $require['item']; ?></td>
-                            <td><?php echo $require['status'] ? '通过' : '未通过'; ?></td>
-                            <td><?php echo $require['intro']; ?></td>
-                        </tr>
-                    <?php } ?>
-                    </tbody>
-                </table>
-            </div>
-            <div class="col-12 my-5 text-right">
-                <?php if ($ok) { ?>
-                    <a href="?step=1" class="btn btn-info">下一步</a>
+        </header>
+        <main>
+            <h2>环境检测</h2>
+            <ul class="check-list">
+                <?php foreach ($requires as $require) { ?>
+                    <li class="check-item">
+                        <div class="check-header">
+                            <span class="check-name"><?php echo $require['item']; ?></span>
+                            <span class="<?php echo $require['status'] ? 'status passed' : 'status failed'; ?>"></span>
+                        </div>
+                        <p class="check-description"><?php echo $require['intro'] ?></p>
+                    </li>
                 <?php } ?>
-            </div>
-        </div>
+            </ul>
+        </main>
+        <footer>
+            <?php if (!$ok) { ?>
+                <button class="next-button" disabled>下一步</button>
+            <?php } else { ?>
+                <a href="?step=1" class="next-button">下一步</a>
+            <?php } ?>
+        </footer>
     </div>
     </body>
     </html>

From 2f7433c1c2fec59402ad8db9144693dc800be37a Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 14:13:42 +0800
Subject: [PATCH 28/40] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=AC=AC=E4=B8=80=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/public/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xyz.meedu.api/public/install.php b/xyz.meedu.api/public/install.php
index bdf989aeb..bfe018821 100644
--- a/xyz.meedu.api/public/install.php
+++ b/xyz.meedu.api/public/install.php
@@ -178,7 +178,7 @@ function is_https()
                 border-radius: 8px;
                 box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
                 width: 100%;
-                max-width: 600px;
+                max-width: 700px;
                 overflow: hidden;
             }
 

From 8ebdb7be1b0cac85096dafe2895b7ad61084cbac Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 14:23:50 +0800
Subject: [PATCH 29/40] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=AC=AC=E4=BA=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/public/install.php | 212 ++++++++++++++++++++++---------
 1 file changed, 154 insertions(+), 58 deletions(-)

diff --git a/xyz.meedu.api/public/install.php b/xyz.meedu.api/public/install.php
index bfe018821..956290bde 100644
--- a/xyz.meedu.api/public/install.php
+++ b/xyz.meedu.api/public/install.php
@@ -215,33 +215,41 @@ function is_https()
                 list-style: none;
                 padding: 0;
             }
+
             .check-item {
                 border-bottom: 1px solid #e5e7eb;
                 padding: 10px 0;
             }
+
             .check-item:last-child {
                 border-bottom: none;
             }
+
             .check-header {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
                 margin-bottom: 5px;
             }
+
             .check-name {
                 font-weight: bold;
             }
+
             .status {
                 width: 20px;
                 height: 20px;
                 border-radius: 50%;
             }
+
             .passed {
                 background-color: #10b981;
             }
+
             .failed {
                 background-color: #ef4444;
             }
+
             .check-description {
                 font-size: 0.875rem;
                 color: #6b7280;
@@ -383,71 +391,159 @@ function is_https()
         }
     }
     ?>
-    <!doctype html>
-    <html lang="en">
+    <!DOCTYPE html>
+    <html lang="zh-CN">
     <head>
         <meta charset="UTF-8">
-        <meta name="viewport"
-              content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-        <meta http-equiv="X-UA-Compatible" content="ie=edge">
-        <link crossorigin="anonymous"
-              integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
-              href="https://lib.baomitu.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
-        <title>MeEdu安装程序</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>XX安装程序 - 数据库配置</title>
+        <style>
+            body {
+                font-family: Arial, sans-serif;
+                background-color: #f3f4f6;
+                margin: 0;
+                padding: 20px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                min-height: 100vh;
+            }
+
+            .container {
+                background-color: white;
+                border-radius: 8px;
+                box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+                width: 100%;
+                max-width: 700px;
+                overflow: hidden;
+            }
+
+            header {
+                background-color: #f9fafb;
+                padding: 20px 40px 20px 20px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+            }
+
+            .logo-title {
+                display: flex;
+                align-items: center;
+            }
+
+            .logo {
+                width: 40px;
+                height: 40px;
+                margin-right: 10px;
+            }
+
+            main {
+                padding: 20px 40px 20px 20px;
+            }
+
+            h2 {
+                font-size: 1.125rem;
+                color: #374151;
+                margin-bottom: 1rem;
+            }
+
+            .form-group {
+                margin-bottom: 1rem;
+            }
+
+            label {
+                display: block;
+                margin-bottom: 0.5rem;
+                font-weight: bold;
+                color: #374151;
+            }
+
+            input[type="text"],
+            input[type="password"] {
+                width: 100%;
+                padding: 0.5rem;
+                border: 1px solid #d1d5db;
+                border-radius: 4px;
+                font-size: 1rem;
+            }
+
+            .hint {
+                font-size: 0.875rem;
+                color: #6b7280;
+                margin-top: 0.25rem;
+            }
+
+            footer {
+                background-color: #f9fafb;
+                padding: 20px 40px 20px 20px;
+                text-align: right;
+            }
+
+            .next-button {
+                background-color: #3b82f6;
+                color: white;
+                border: none;
+                padding: 10px 20px;
+                border-radius: 4px;
+                cursor: pointer;
+                font-size: 1rem;
+            }
+
+            .next-button:hover {
+                background-color: #2563eb;
+            }
+
+            @media (max-width: 640px) {
+                header, main, footer {
+                    padding-right: 20px;
+                }
+            }
+        </style>
     </head>
     <body>
     <div class="container">
-        <div class="row justify-content-center">
-            <div class="col-12 my-5">
+        <header>
+            <div class="logo-title">
                 <a href="https://meedu.vip/" target="_blank"><img src="/images/logo.png" height="40"></a>
             </div>
-            <div class="col-12 mb-5 text-center">
-                <h2>MeEdu安装程序</h2>
-            </div>
-            <div class="col-4">
-                <?php if ($error) { ?>
-                    <div class="alert alert-danger">
-                        <p class="mb-0"><?php echo $error; ?></p>
-                    </div>
-                <?php } ?>
-                <form action="" method="post">
-                    <input type="hidden" name="submit" value="1">
-                    <div class="form-group">
-                        <label>网站地址</label>
-                        <input type="text" name="url" value="<?php echo $url; ?>" class="form-control"
-                               placeholder="例如：https://meeedu.vip" required>
-                    </div>
-                    <div class="form-group">
-                        <label>数据库地址</label>
-                        <input type="text" name="db_host" value="<?php echo $dbHost; ?>" class="form-control"
-                               placeholder="例如：127.0.0.1" required>
-                    </div>
-                    <div class="form-group">
-                        <label>数据库端口</label>
-                        <input type="text" name="db_port" value="<?php echo $dbPort; ?>" class="form-control"
-                               placeholder="例如：3306" required>
-                    </div>
-                    <div class="form-group">
-                        <label>数据库用户</label>
-                        <input type="text" name="db_user" value="<?php echo $dbUser; ?>" class="form-control"
-                               placeholder="例如：root" required>
-                    </div>
-                    <div class="form-group">
-                        <label>数据库密码</label>
-                        <input type="text" name="db_pass" value="<?php echo $dbPass; ?>" class="form-control"
-                               placeholder="为空可不填写">
-                    </div>
-                    <div class="form-group">
-                        <label>数据库</label>
-                        <input type="text" name="db_db" value="<?php echo $dbDb; ?>" class="form-control"
-                               placeholder="例如：meedu" required>
-                    </div>
-                    <div class="form-group">
-                        <button type="submit" class="btn btn-info btn-block">下一步</button>
-                    </div>
-                </form>
-            </div>
-        </div>
+        </header>
+        <form id="dbForm" action="" method="POST">
+            <main>
+                <h2>请输入数据库连接信息</h2>
+                <div class="form-group">
+                    <label for="config-url">访问地址：</label>
+                    <input type="text" id="config-url" name="url" value="<?php echo $url; ?>" required>
+                    <p class="hint">http://或者https://为前缀开头的URL地址</p>
+                </div>
+                <div class="form-group">
+                    <label for="dbHost">数据库主机：</label>
+                    <input type="text" id="dbHost" name="db_host" value="<?php echo $dbHost; ?>" required>
+                    <p class="hint">通常为localhost，除非您的数据库在远程服务器上</p>
+                </div>
+                <div class="form-group">
+                    <label for="dbPort">数据库端口：</label>
+                    <input type="text" id="dbPort" name="db_port" value="<?php echo $dbPort; ?>" required>
+                    <p class="hint">通常为3306端口</p>
+                </div>
+                <div class="form-group">
+                    <label for="dbName">数据库名称：</label>
+                    <input type="text" id="dbName" name="db_db" value="<?php echo $dbDb; ?>" required>
+                    <p class="hint">请确保该数据库已经创建</p>
+                </div>
+                <div class="form-group">
+                    <label for="dbUser">数据库用户名：</label>
+                    <input type="text" id="dbUser" name="db_user" value="<?php echo $dbUser; ?>" required>
+                </div>
+                <div class="form-group">
+                    <label for="dbPassword">数据库密码：</label>
+                    <input type="password" id="dbPassword" name="db_pass" value="<?php echo $dbPass; ?>" required>
+                </div>
+
+            </main>
+            <footer>
+                <button type="submit" form="dbForm" class="next-button">下一步</button>
+            </footer>
+        </form>
     </div>
     </body>
     </html>

From 494033804a7081d8b22f567c2b79e2cff2197543 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 14:30:05 +0800
Subject: [PATCH 30/40] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=AC=AC=E4=B8=89=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/public/install.php | 134 +++++++++++++++++++++++++------
 1 file changed, 108 insertions(+), 26 deletions(-)

diff --git a/xyz.meedu.api/public/install.php b/xyz.meedu.api/public/install.php
index 956290bde..5dc4d0d1a 100644
--- a/xyz.meedu.api/public/install.php
+++ b/xyz.meedu.api/public/install.php
@@ -396,7 +396,7 @@ function is_https()
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>XX安装程序 - 数据库配置</title>
+        <title>MeEdu安装程序 - 数据库配置</title>
         <style>
             body {
                 font-family: Arial, sans-serif;
@@ -552,40 +552,122 @@ function is_https()
     // 安装成功
     file_put_contents('../storage/install.lock', time());
     ?>
-    <!doctype html>
-    <html lang="en">
+    <!DOCTYPE html>
+    <html lang="zh-CN">
     <head>
         <meta charset="UTF-8">
-        <meta name="viewport"
-              content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-        <meta http-equiv="X-UA-Compatible" content="ie=edge">
-        <link crossorigin="anonymous"
-              integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
-              href="https://lib.baomitu.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
-        <title>MeEdu安装程序</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>MeEdu安装程序 - 安装完成</title>
+        <style>
+            body {
+                font-family: Arial, sans-serif;
+                background-color: #f3f4f6;
+                margin: 0;
+                padding: 20px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                min-height: 100vh;
+            }
+            .container {
+                background-color: white;
+                border-radius: 8px;
+                box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+                width: 100%;
+                max-width: 600px;
+                overflow: hidden;
+            }
+            header {
+                background-color: #f9fafb;
+                padding: 20px 40px 20px 20px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+            }
+            .logo-title {
+                display: flex;
+                align-items: center;
+            }
+            .logo {
+                width: 40px;
+                height: 40px;
+                margin-right: 10px;
+            }
+            main {
+                padding: 20px 20px 20px 20px;
+            }
+            h2 {
+                font-size: 1.5rem;
+                color: #10b981;
+                margin-bottom: 1rem;
+                text-align: center;
+            }
+            .success-message {
+                text-align: center;
+                margin-bottom: 2rem;
+            }
+            .admin-info {
+                background-color: #f3f4f6;
+                border-radius: 8px;
+                padding: 20px;
+                margin-bottom: 2rem;
+            }
+            .admin-info h3 {
+                font-size: 1.125rem;
+                color: #374151;
+                margin-top: 0;
+                margin-bottom: 1rem;
+            }
+            .admin-info p {
+                margin: 0.5rem 0;
+            }
+            .warning {
+                color: #ef4444;
+                font-weight: bold;
+            }
+            footer {
+                background-color: #f9fafb;
+                padding: 20px 40px 20px 20px;
+                text-align: right;
+            }
+            .finish-button {
+                background-color: #10b981;
+                color: white;
+                border: none;
+                padding: 10px 20px;
+                border-radius: 4px;
+                cursor: pointer;
+                font-size: 1rem;
+            }
+            .finish-button:hover {
+                background-color: #059669;
+            }
+            @media (max-width: 640px) {
+                header, main, footer {
+                    padding-right: 20px;
+                }
+            }
+        </style>
     </head>
     <body>
     <div class="container">
-        <div class="row justify-content-center">
-            <div class="col-12 my-5">
+        <header>
+            <div class="logo-title">
                 <a href="https://meedu.vip/" target="_blank"><img src="/images/logo.png" height="40"></a>
             </div>
-            <div class="col-12 mb-5 text-center">
-                <h2>MeEdu安装程序</h2>
+        </header>
+        <main>
+            <h2>恭喜！安装成功</h2>
+            <div class="success-message">
+                <p>MeEdu程序已经成功安装到您的服务器上。您现在可以开始使用了。</p>
             </div>
-            <div class="col-4 text-center">
-                <div class="alert alert-warning">
-                    <p class="mb-0">请记得删除install.php文件</p>
-                    <p class="mb-0">后台账号：<code>meedu@meedu.meedu</code></p>
-                    <p class="mb-0">后台密码：<code>meedu123</code></p>
-                    <p class="mb-0">登录后台之后记得修改密码哦！</p>
-                </div>
-                <div class="pb-5">
-                    <h3 style="color: green" class="my-5">安装成功</h3>
-                    <a href="/" class="btn btn-success">网站首页</a>
-                </div>
+            <div class="admin-info">
+                <h3>管理员账号信息</h3>
+                <p><strong>用户名：</strong> meedu@meedu.meedu</p>
+                <p><strong>密码：</strong> meedu123</p>
+                <p class="warning">请立即登录并修改默认密码！</p>
             </div>
-        </div>
+        </main>
     </div>
     </body>
     </html>

From a3a544e0cba8645e2d1a49fb22912d6fe5dafe32 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 14:30:28 +0800
Subject: [PATCH 31/40] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=AC=AC=E4=B8=89=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/public/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xyz.meedu.api/public/install.php b/xyz.meedu.api/public/install.php
index 5dc4d0d1a..858b798bd 100644
--- a/xyz.meedu.api/public/install.php
+++ b/xyz.meedu.api/public/install.php
@@ -663,7 +663,7 @@ function is_https()
             </div>
             <div class="admin-info">
                 <h3>管理员账号信息</h3>
-                <p><strong>用户名：</strong> meedu@meedu.meedu</p>
+                <p><strong>账号：</strong> meedu@meedu.meedu</p>
                 <p><strong>密码：</strong> meedu123</p>
                 <p class="warning">请立即登录并修改默认密码！</p>
             </div>

From 73665d5693aa2026ece8561c7cde77994e8486f5 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 14:31:06 +0800
Subject: [PATCH 32/40] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f399c793..2c86b5efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 优化
 
+- 优化:[API]重构安装程序界面
 - 优化:[API]重构微信公众号的扫码登录
 - 优化:[API]删除微信公众号消息回复
 - 优化:[API]删除微信公众号菜单编辑

From 3b81258cabb8c95109bfecdc37e76b61d4e87277 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 4 Nov 2024 15:04:15 +0800
Subject: [PATCH 33/40] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/weixin-login-dailog/index.tsx  |  4 +-
 .../components/bind-weixin/index.module.scss  |  9 ++++-
 .../member/components/bind-weixin/index.tsx   | 40 +++++++------------
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index 3aea56071..dda93663a 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -185,7 +185,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
                 {expired ? (
                   <QRCode
                     value={qrode}
-                    size={300}
+                    size={200}
                     status="expired"
                     onRefresh={() => {
                       setRemainingTime({
@@ -201,7 +201,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
                 ) : (
                   <QRCode
                     value={qrode}
-                    size={300}
+                    size={200}
                     status={loading ? "loading" : "active"}
                   />
                 )}
diff --git a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.module.scss b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.module.scss
index 2e76d7030..3e860f828 100644
--- a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.module.scss
+++ b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.module.scss
@@ -89,11 +89,18 @@
 
 .box {
   width: 100%;
-  margin-top: 30px;
+  margin-top: 16px;
   display: flex;
   flex-direction: column;
   align-items: center;
+
   .time {
+    font-size: 0.8rem;
+    margin-top: 16px;
     margin-bottom: 16px;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    padding: 5px 10px;
+    border-radius: 20px;
+    color: rgba(0, 0, 0, 0.6);
   }
 }
diff --git a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
index 6ceb3350c..ab7059428 100644
--- a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
+++ b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
@@ -129,7 +129,7 @@ export const BindWeixinDialog: React.FC<PropInterface> = ({
           closable={false}
         >
           <div className={styles["tabs"]}>
-            <div className={styles["tab-active-item"]}>绑定微信</div>
+            <div className={styles["tab-active-item"]}>绑定微信账号</div>
             <img
               className={styles["btn-close"]}
               onClick={() => {
@@ -140,34 +140,12 @@ export const BindWeixinDialog: React.FC<PropInterface> = ({
             />
           </div>
           <div className={styles["box"]}>
-            {!loading && !expired && qrode !== "" && (
-              <div className={styles["time"]}>
-                有效期：
-                {remainingTime.day !== 0 && (
-                  <span>
-                    {remainingTime.day}天{remainingTime.hr}时{remainingTime.min}
-                    分{remainingTime.sec}秒
-                  </span>
-                )}
-                {remainingTime.day === 0 && remainingTime.hr !== "00" && (
-                  <span>
-                    {remainingTime.hr}时{remainingTime.min}分{remainingTime.sec}
-                    秒
-                  </span>
-                )}
-                {remainingTime.day === 0 && remainingTime.hr === "00" && (
-                  <span>
-                    {remainingTime.min}分{remainingTime.sec}秒
-                  </span>
-                )}
-              </div>
-            )}
             {qrode !== "" && (
               <>
                 {expired ? (
                   <QRCode
                     value={qrode}
-                    size={300}
+                    size={200}
                     status="expired"
                     onRefresh={() => {
                       setRemainingTime({
@@ -183,12 +161,24 @@ export const BindWeixinDialog: React.FC<PropInterface> = ({
                 ) : (
                   <QRCode
                     value={qrode}
-                    size={300}
+                    size={200}
                     status={loading ? "loading" : "active"}
                   />
                 )}
               </>
             )}
+            {!loading &&
+            !expired &&
+            qrode !== "" &&
+            remainingTime.min != "00" &&
+            remainingTime.sec !== "00" ? (
+              <div className={styles["time"]}>
+                有效期：
+                <span>
+                  {remainingTime.min}分{remainingTime.sec}秒
+                </span>
+              </div>
+            ) : null}
           </div>
         </Modal>
       ) : null}

From 9f3381c513cb8f8b2c7b19ebc265cc825451e51c Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Tue, 5 Nov 2024 16:36:31 +0800
Subject: [PATCH 34/40] =?UTF-8?q?fixed:=20=E5=BE=AE=E4=BF=A1=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E5=80=92=E8=AE=A1=E6=97=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/weixin-login-dailog/index.module.scss | 2 +-
 .../src/components/weixin-login-dailog/index.tsx         | 9 +++------
 .../src/pages/member/components/bind-weixin/index.tsx    | 6 +-----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss b/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
index 35335ceed..723addd3e 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.module.scss
@@ -69,6 +69,6 @@
     border: 1px solid rgba(0, 0, 0, 0.1);
     padding: 5px 10px;
     border-radius: 20px;
-    color: rgba(0,0,0,0.6);
+    color: rgba(0, 0, 0, 0.6);
   }
 }
diff --git a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
index dda93663a..8df32309d 100644
--- a/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
+++ b/xyz.meedu.pc/src/components/weixin-login-dailog/index.tsx
@@ -60,7 +60,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
       setExpired(false);
       setQrode(res.data.url);
       setKey(res.data.key);
-      countdown(res.data.expire);
+      countdown(res.data.expire - 290);
       timer = setInterval(() => checkWechatLogin(res.data.key), 1000);
       setLoading(false);
     });
@@ -179,6 +179,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
               其他方式登录&gt;&gt;
             </a>
           </div>
+
           <div className={styles["box"]}>
             {qrode !== "" && (
               <>
@@ -208,11 +209,7 @@ export const WeixinLoginDialog: React.FC<PropInterface> = ({
               </>
             )}
 
-            {!loading &&
-            !expired &&
-            qrode !== "" &&
-            remainingTime.min !== "00" &&
-            remainingTime.sec !== "00" ? (
+            {!loading && !expired && qrode !== "" ? (
               <div className={styles["time"]}>
                 有效期：
                 <span>
diff --git a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
index ab7059428..eebb8c965 100644
--- a/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
+++ b/xyz.meedu.pc/src/pages/member/components/bind-weixin/index.tsx
@@ -167,11 +167,7 @@ export const BindWeixinDialog: React.FC<PropInterface> = ({
                 )}
               </>
             )}
-            {!loading &&
-            !expired &&
-            qrode !== "" &&
-            remainingTime.min != "00" &&
-            remainingTime.sec !== "00" ? (
+            {!loading && !expired && qrode !== "" ? (
               <div className={styles["time"]}>
                 有效期：
                 <span>

From b9ec26fbf577992a068f7bfe4d74d9924ab31bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=B9=A6=E7=A7=91=E6=8A=80?=
 <412656+myteng@user.noreply.gitee.com>
Date: Mon, 25 Nov 2024 04:04:22 +0000
Subject: [PATCH 35/40] =?UTF-8?q?!25=20=E7=A7=BB=E9=99=A4=E4=BA=91?=
 =?UTF-8?q?=E7=89=87=E7=9F=AD=E4=BF=A1=20*=20=E5=88=A0=E9=99=A4=E4=BA=91?=
 =?UTF-8?q?=E7=89=87=E7=9F=AD=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../Meedu/Core/UpgradeLog/UpgradeV4912.php    | 29 +++++++++++
 xyz.meedu.api/app/Meedu/Sms/Yunpian.php       | 47 -----------------
 .../database/seeders/AppConfigSeeder.php      | 52 -------------------
 4 files changed, 30 insertions(+), 99 deletions(-)
 delete mode 100644 xyz.meedu.api/app/Meedu/Sms/Yunpian.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c86b5efb..92b046c67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 优化
 
+- 优化:[API]删除云片短信服务
 - 优化:[API]重构安装程序界面
 - 优化:[API]重构微信公众号的扫码登录
 - 优化:[API]删除微信公众号消息回复
diff --git a/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php b/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php
index 68f8aafe1..ca91de291 100644
--- a/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php
+++ b/xyz.meedu.api/app/Meedu/Core/UpgradeLog/UpgradeV4912.php
@@ -19,6 +19,7 @@ public static function handle()
         self::deleteSomeConfigItems();
         self::renameWechatLoginKeyName();
         self::deleteSomePermissions();
+        self::updateSmsServiceValue();
     }
 
     private static function deleteSomePermissions()
@@ -42,6 +43,12 @@ private static function deleteSomeConfigItems()
             ->whereIn('key', [
                 'meedu.mp_wechat.enabled_scan_login',
                 'meedu.mp_wechat.scan_login_alert',
+
+                'sms.gateways.yunpian.api_key',
+                'sms.gateways.yunpian.template.password_reset',
+                'sms.gateways.yunpian.template.register',
+                'sms.gateways.yunpian.template.mobile_bind',
+                'sms.gateways.yunpian.template.login',
             ])
             ->delete();
     }
@@ -53,4 +60,26 @@ private static function renameWechatLoginKeyName()
             ->update(['name' => '启动微信登录']);
     }
 
+    private static function updateSmsServiceValue()
+    {
+        AppConfig::query()
+            ->where('key', 'meedu.system.sms')
+            ->update(
+                [
+                    'option_value' => json_encode(
+                        [
+                            [
+                                'title' => '阿里云',
+                                'key' => 'aliyun',
+                            ],
+                            [
+                                'title' => '腾讯云',
+                                'key' => 'tencent',
+                            ],
+                        ]
+                    ),
+                ]
+            );
+    }
+
 }
diff --git a/xyz.meedu.api/app/Meedu/Sms/Yunpian.php b/xyz.meedu.api/app/Meedu/Sms/Yunpian.php
deleted file mode 100644
index 6daf3d937..000000000
--- a/xyz.meedu.api/app/Meedu/Sms/Yunpian.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of the MeEdu.
- *
- * (c) 杭州白书科技有限公司
- */
-
-namespace App\Meedu\Sms;
-
-use GuzzleHttp\Client;
-use App\Services\Base\Interfaces\ConfigServiceInterface;
-
-class Yunpian implements SmsInterface
-{
-    /**
-     * @param string $mobile
-     * @param $code
-     * @param $template
-     * @throws \GuzzleHttp\Exception\GuzzleException
-     */
-    public function sendCode(string $mobile, $code, $template)
-    {
-        /**
-         * @var ConfigServiceInterface $configService
-         */
-        $configService = app()->make(ConfigServiceInterface::class);
-        $key = $configService->getSms()['gateways']['yunpian']['api_key'] ?? '';
-
-        $http = new Client(['timeout' => 5.0]);
-        $response = $http->post('https://sms.yunpian.com/v2/sms/single_send.json', [
-            'form_params' => [
-                'apikey' => $key,
-                'mobile' => $mobile,
-                'text' => str_replace('#code#', $code, $template),
-            ],
-        ]);
-        if ($response->getStatusCode() !== 200) {
-            throw new \Exception('云片短信请求失败');
-        }
-        $body = json_decode($response->getBody()->getContents(), true);
-        $responseCode = $body['code'] ?? false;
-        if ($responseCode !== 0) {
-            throw new \Exception($body['msg'] ?? json_encode($body));
-        }
-    }
-}
diff --git a/xyz.meedu.api/database/seeders/AppConfigSeeder.php b/xyz.meedu.api/database/seeders/AppConfigSeeder.php
index b7be7ef39..fca198fa3 100644
--- a/xyz.meedu.api/database/seeders/AppConfigSeeder.php
+++ b/xyz.meedu.api/database/seeders/AppConfigSeeder.php
@@ -174,10 +174,6 @@ public function run()
                         'title' => '腾讯云',
                         'key' => 'tencent',
                     ],
-                    [
-                        'title' => '云片',
-                        'key' => 'yunpian',
-                    ],
                 ]),
                 'value' => 'tencent',
             ],
@@ -246,54 +242,6 @@ public function run()
                 'value' => '',
             ],
 
-            [
-                'group' => '短信',
-                'name' => '云片ApiKey',
-                'field_type' => 'text',
-                'sort' => 8,
-                'default_value' => '',
-                'key' => 'sms.gateways.yunpian.api_key',
-                'value' => '',
-                'is_private' => 1,
-            ],
-            [
-                'group' => '短信',
-                'name' => '云片密码重置模板',
-                'field_type' => 'textarea',
-                'sort' => 9,
-                'default_value' => '',
-                'key' => 'sms.gateways.yunpian.template.password_reset',
-                'value' => '',
-                'help' => '注意：云片短信不是填写模板ID，而是填写模板内容',
-            ],
-            [
-                'group' => '短信',
-                'name' => '云片注册模板',
-                'field_type' => 'textarea',
-                'sort' => 10,
-                'default_value' => '',
-                'key' => 'sms.gateways.yunpian.template.register',
-                'value' => '',
-            ],
-            [
-                'group' => '短信',
-                'name' => '云片手机号绑定模板',
-                'field_type' => 'textarea',
-                'sort' => 11,
-                'default_value' => '',
-                'key' => 'sms.gateways.yunpian.template.mobile_bind',
-                'value' => '',
-            ],
-            [
-                'group' => '短信',
-                'name' => '云片手机号登陆模板',
-                'field_type' => 'textarea',
-                'sort' => 12,
-                'default_value' => '',
-                'key' => 'sms.gateways.yunpian.template.login',
-                'value' => '',
-            ],
-
             // 腾讯云短信配置
             [
                 'group' => '短信',

From 646b9125725b6fd06fab619899110f38a45f57dc Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 25 Nov 2024 12:12:05 +0800
Subject: [PATCH 36/40] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=85=BE=E8=AE=AF?=
 =?UTF-8?q?=E4=BA=91=E7=9A=84=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=92=AD=E6=94=BE=E9=99=90=E5=88=B6:=20=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=97=B6=E9=95=BF=E6=8F=90=E5=8D=87=E5=88=B012?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=20&&=20IP=E9=99=90=E5=88=B6=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E5=88=B05=E4=B8=AA=20&&=20=E8=AF=95=E7=9C=8B=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF=E6=8F=90=E5=8D=87=E5=88=B045s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/app/Meedu/Tencent/Vod.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xyz.meedu.api/app/Meedu/Tencent/Vod.php b/xyz.meedu.api/app/Meedu/Tencent/Vod.php
index 64835d8a7..eb34edeb7 100644
--- a/xyz.meedu.api/app/Meedu/Tencent/Vod.php
+++ b/xyz.meedu.api/app/Meedu/Tencent/Vod.php
@@ -208,14 +208,14 @@ public function generateUrlWithSignature($url, int $previewSeconds = 0)
         $urlInfo = parse_url($url);
         $dir = pathinfo($urlInfo['path'], PATHINFO_DIRNAME) . '/';
         // 链接有效时间,默认三个小时
-        $t = dechex(time() + 3600 * 3);
+        $t = dechex(time() + 3600 * 12);
         // 试看时长[单位:秒]
         $exper = 0;
         if ($previewSeconds > 0) {
-            $exper = max($previewSeconds, 30);
+            $exper = max($previewSeconds, 45);
         };
         // ip限制[1个]
-        $rlimit = 1;
+        $rlimit = 5;
         // 标识符
         $us = Str::random(6);
 

From 2159f58924d1f715774d0f8dda750c34ff4be243 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 25 Nov 2024 12:12:49 +0800
Subject: [PATCH 37/40] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92b046c67..62f6f80d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - 优化:[API]重构微信公众号的扫码登录
 - 优化:[API]删除微信公众号消息回复
 - 优化:[API]删除微信公众号菜单编辑
+- 优化:[API]腾讯云点播的视频播放稳定性
 
 # 版本 4.9.11
 

From b9bac0c3fb7c871ea41377359f99fe209298496e Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 25 Nov 2024 12:15:06 +0800
Subject: [PATCH 38/40] =?UTF-8?q?=E6=96=B0=E5=A2=9E:[API]Redis=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84env=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      | 4 ++++
 xyz.meedu.api/.env.example        | 1 +
 xyz.meedu.api/.env.install        | 1 +
 xyz.meedu.api/config/database.php | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62f6f80d6..3faf4dad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # 版本 4.9.12
 
+## 新增
+
+- 新增:[API]Redis数据库的env配置项
+
 ## 优化
 
 - 优化:[API]删除云片短信服务
diff --git a/xyz.meedu.api/.env.example b/xyz.meedu.api/.env.example
index 8c64a78ee..a5c3a112f 100644
--- a/xyz.meedu.api/.env.example
+++ b/xyz.meedu.api/.env.example
@@ -15,6 +15,7 @@ DB_PASSWORD=root
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
+REDIS_DB=0
 
 # JWT
 JWT_SECRET=
diff --git a/xyz.meedu.api/.env.install b/xyz.meedu.api/.env.install
index bf498ccfb..611e62ae7 100644
--- a/xyz.meedu.api/.env.install
+++ b/xyz.meedu.api/.env.install
@@ -15,6 +15,7 @@ DB_PASSWORD={MYSQL_PASSWORD}
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
+REDIS_DB=0
 
 # JWT
 JWT_SECRET=
diff --git a/xyz.meedu.api/config/database.php b/xyz.meedu.api/config/database.php
index 760795990..58b461eb8 100644
--- a/xyz.meedu.api/config/database.php
+++ b/xyz.meedu.api/config/database.php
@@ -118,7 +118,7 @@
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
-            'database' => 0,
+            'database' => env('REDIS_DB', 0),
         ],
 
     ],

From f1acc53419d8bd706301711fa6068c7b08a45021 Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 25 Nov 2024 13:57:00 +0800
Subject: [PATCH 39/40] =?UTF-8?q?migration=E7=9A=84ipAddress->string(15)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../database/migrations/2022_07_31_102135_create_admin_logs.php | 2 +-
 .../migrations/2022_08_08_103539_create_user_upload_images.php  | 2 +-
 .../migrations/2023_09_18_141926_add_ip_for_course_comment.php  | 2 +-
 .../migrations/2023_09_18_141932_add_ip_for_video_comment.php   | 2 +-
 ...07_01_141659_create_course_attach_download_records_table.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xyz.meedu.api/database/migrations/2022_07_31_102135_create_admin_logs.php b/xyz.meedu.api/database/migrations/2022_07_31_102135_create_admin_logs.php
index 0782e6cde..5850d6eae 100644
--- a/xyz.meedu.api/database/migrations/2022_07_31_102135_create_admin_logs.php
+++ b/xyz.meedu.api/database/migrations/2022_07_31_102135_create_admin_logs.php
@@ -25,7 +25,7 @@ public function up()
             $table->string('module', 32)->default('')->comment('模块');
             $table->string('opt', 32)->default('')->comment('操作指令');
             $table->mediumText('remark')->nullable(true)->default(null)->comment('备注');
-            $table->ipAddress('ip')->default('')->comment('操作ip');
+            $table->string('ip', 15)->default('')->comment('操作ip');
             $table->timestamp('created_at')->nullable(true)->default(null);
 
             $table->index(['admin_id', 'module', 'opt'], 'a_m_o');
diff --git a/xyz.meedu.api/database/migrations/2022_08_08_103539_create_user_upload_images.php b/xyz.meedu.api/database/migrations/2022_08_08_103539_create_user_upload_images.php
index fbbf9c0ac..049a514d1 100644
--- a/xyz.meedu.api/database/migrations/2022_08_08_103539_create_user_upload_images.php
+++ b/xyz.meedu.api/database/migrations/2022_08_08_103539_create_user_upload_images.php
@@ -30,7 +30,7 @@ public function up()
             $table->string('visit_url', 255)->default('')->comment('访问地址');
 
             $table->string('log_api', 255)->default('')->comment('上传的api');
-            $table->ipAddress('log_ip')->default('')->comment('上传者ip地址');
+            $table->string('log_ip', 15)->default('')->comment('上传者ip地址');
             $table->string('log_ua', 255)->default('')->comment('上传者的UA');
 
             $table->timestamp('created_at')->nullable(true)->default(null);
diff --git a/xyz.meedu.api/database/migrations/2023_09_18_141926_add_ip_for_course_comment.php b/xyz.meedu.api/database/migrations/2023_09_18_141926_add_ip_for_course_comment.php
index 6b4cbf84f..54a118f9c 100644
--- a/xyz.meedu.api/database/migrations/2023_09_18_141926_add_ip_for_course_comment.php
+++ b/xyz.meedu.api/database/migrations/2023_09_18_141926_add_ip_for_course_comment.php
@@ -20,7 +20,7 @@ class AddIpForCourseComment extends Migration
     public function up()
     {
         Schema::table(\App\Constant\TableConstant::TABLE_COURSE_COMMENTS, function (Blueprint $table) {
-            $table->ipAddress('ip')->default('');
+            $table->string('ip', 15)->default('');
             $table->string('ip_province', 32)->default('');
         });
     }
diff --git a/xyz.meedu.api/database/migrations/2023_09_18_141932_add_ip_for_video_comment.php b/xyz.meedu.api/database/migrations/2023_09_18_141932_add_ip_for_video_comment.php
index 5a1c01580..ba460eb3c 100644
--- a/xyz.meedu.api/database/migrations/2023_09_18_141932_add_ip_for_video_comment.php
+++ b/xyz.meedu.api/database/migrations/2023_09_18_141932_add_ip_for_video_comment.php
@@ -20,7 +20,7 @@ class AddIpForVideoComment extends Migration
     public function up()
     {
         Schema::table(\App\Constant\TableConstant::TABLE_VIDEO_COMMENTS, function (Blueprint $table) {
-            $table->ipAddress('ip')->default('');
+            $table->string('ip', 15)->default('');
             $table->string('ip_province', 32)->default('');
         });
     }
diff --git a/xyz.meedu.api/database/migrations/2024_07_01_141659_create_course_attach_download_records_table.php b/xyz.meedu.api/database/migrations/2024_07_01_141659_create_course_attach_download_records_table.php
index b70bac173..ea5370ca9 100644
--- a/xyz.meedu.api/database/migrations/2024_07_01_141659_create_course_attach_download_records_table.php
+++ b/xyz.meedu.api/database/migrations/2024_07_01_141659_create_course_attach_download_records_table.php
@@ -24,7 +24,7 @@ public function up()
             $table->integer('user_id')->default(0)->comment('学员ID');
             $table->integer('course_id')->default(0)->comment('录播课ID');
             $table->integer('attach_id')->default(0)->comment('附件ID');
-            $table->ipAddress('ip')->nullable()->default(null)->comment('下载IP');
+            $table->string('ip', 15)->nullable()->default(null)->comment('下载IP');
             $table->string('ip_area')->default('')->comment('IP转换为地域');
             $table->timestamp('created_at')->nullable()->default(null)->comment('创建时间');
 

From 10c078369094a6f61bd0c21ece12e10c28985bbe Mon Sep 17 00:00:00 2001
From: xxx <x@x.x>
Date: Mon, 25 Nov 2024 14:26:57 +0800
Subject: [PATCH 40/40] =?UTF-8?q?fixed:=20=E5=82=BB=E7=93=9C=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xyz.meedu.api/public/install.php | 61 ++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/xyz.meedu.api/public/install.php b/xyz.meedu.api/public/install.php
index 858b798bd..02abdf35a 100644
--- a/xyz.meedu.api/public/install.php
+++ b/xyz.meedu.api/public/install.php
@@ -332,7 +332,8 @@ function is_https()
     if ($isSubmit) {
         // 测试数据库连接
         try {
-            new PDO('mysql:host=' . $dbHost . ';port=' . $dbPort . ';dbname=' . $dbDb, $dbUser, $dbPass);
+            $pdo = new PDO('mysql:host=' . $dbHost . ';port=' . $dbPort . ';dbname=' . $dbDb, $dbUser, $dbPass);
+            $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
             $dbConnected = true;
         } catch (Exception $e) {
             $error = $e->getMessage();
@@ -498,6 +499,33 @@ function is_https()
                     padding-right: 20px;
                 }
             }
+
+            .error-message {
+                background-color: #fee2e2;
+                border: 1px solid #fecaca;
+                color: #dc2626;
+                padding: 1rem;
+                margin: 1rem 20px;
+                border-radius: 4px;
+                display: flex;
+                align-items: center;
+                font-size: 1rem;
+                font-weight: 500;
+                box-shadow: 0 2px 4px rgba(220, 38, 38, 0.1);
+            }
+
+            .error-icon {
+                width: 24px;
+                height: 24px;
+                margin-right: 0.75rem;
+                flex-shrink: 0;
+                color: #dc2626;
+            }
+
+            .error-text {
+                flex: 1;
+                line-height: 1.5;
+            }
         </style>
     </head>
     <body>
@@ -507,7 +535,22 @@ function is_https()
                 <a href="https://meedu.vip/" target="_blank"><img src="/images/logo.png" height="40"></a>
             </div>
         </header>
+        <?php
+        if ($error) {
+            ?>
+            <div class="error-message">
+                <svg class="error-icon" width="24" height="24" viewBox="0 0 20 20" fill="currentColor">
+                    <path fill-rule="evenodd"
+                          d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
+                          clip-rule="evenodd"/>
+                </svg>
+                <span class="error-text">数据库连接失败：<?php echo htmlspecialchars($error); ?></span>
+            </div>
+            <?php
+        }
+        ?>
         <form id="dbForm" action="" method="POST">
+            <input type="hidden" name="submit" value="1">
             <main>
                 <h2>请输入数据库连接信息</h2>
                 <div class="form-group">
@@ -538,7 +581,6 @@ function is_https()
                     <label for="dbPassword">数据库密码：</label>
                     <input type="password" id="dbPassword" name="db_pass" value="<?php echo $dbPass; ?>" required>
                 </div>
-
             </main>
             <footer>
                 <button type="submit" form="dbForm" class="next-button">下一步</button>
@@ -569,6 +611,7 @@ function is_https()
                 align-items: center;
                 min-height: 100vh;
             }
+
             .container {
                 background-color: white;
                 border-radius: 8px;
@@ -577,6 +620,7 @@ function is_https()
                 max-width: 600px;
                 overflow: hidden;
             }
+
             header {
                 background-color: #f9fafb;
                 padding: 20px 40px 20px 20px;
@@ -584,52 +628,63 @@ function is_https()
                 align-items: center;
                 justify-content: space-between;
             }
+
             .logo-title {
                 display: flex;
                 align-items: center;
             }
+
             .logo {
                 width: 40px;
                 height: 40px;
                 margin-right: 10px;
             }
+
             main {
                 padding: 20px 20px 20px 20px;
             }
+
             h2 {
                 font-size: 1.5rem;
                 color: #10b981;
                 margin-bottom: 1rem;
                 text-align: center;
             }
+
             .success-message {
                 text-align: center;
                 margin-bottom: 2rem;
             }
+
             .admin-info {
                 background-color: #f3f4f6;
                 border-radius: 8px;
                 padding: 20px;
                 margin-bottom: 2rem;
             }
+
             .admin-info h3 {
                 font-size: 1.125rem;
                 color: #374151;
                 margin-top: 0;
                 margin-bottom: 1rem;
             }
+
             .admin-info p {
                 margin: 0.5rem 0;
             }
+
             .warning {
                 color: #ef4444;
                 font-weight: bold;
             }
+
             footer {
                 background-color: #f9fafb;
                 padding: 20px 40px 20px 20px;
                 text-align: right;
             }
+
             .finish-button {
                 background-color: #10b981;
                 color: white;
@@ -639,9 +694,11 @@ function is_https()
                 cursor: pointer;
                 font-size: 1rem;
             }
+
             .finish-button:hover {
                 background-color: #059669;
             }
+
             @media (max-width: 640px) {
                 header, main, footer {
                     padding-right: 20px;