Merge branch 'dev'

Qsnh · Nov 25, 2024 · c96aac7 · c96aac7
2 parents 52f63e8 + 10c0783
commit c96aac7
Show file tree

Hide file tree

Showing 72 changed files with 1,343 additions and 3,607 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# 版本 4.9.12
+
+## 新增
+
+- 新增:[API]Redis数据库的env配置项
+
+## 优化
+
+- 优化:[API]删除云片短信服务
+- 优化:[API]重构安装程序界面
+- 优化:[API]重构微信公众号的扫码登录
+- 优化:[API]删除微信公众号消息回复
+- 优化:[API]删除微信公众号菜单编辑
+- 优化:[API]腾讯云点播的视频播放稳定性
+
 # 版本 4.9.11
 
 ## 新增

diff --git 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/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") {

diff --git 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 });
@@ -188,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 />
@@ -206,31 +179,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="启用微信分享"

diff --git a/xyz.meedu.admin/src/pages/wechat/components/create.tsx b/xyz.meedu.admin/src/pages/wechat/components/create.tsx