From 9441414f9eda28d33567633409a3a5041b6f12b3 Mon Sep 17 00:00:00 2001
From: muzi_ys <1099438829@qq.com>
Date: Sat, 6 Aug 2022 23:17:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=87=E6=A1=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=A6=96=E6=AC=A1=E4=B8=8D=E4=BF=9D=E5=AD=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E6=96=87=E6=A1=A3=E6=96=B0=E5=A2=9E=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=8A=A0=E5=85=A5=E5=88=AB=E5=90=8D=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=20=E4=B8=8D=E5=8F=AF=E4=B8=BA=E7=BA=AF=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/article/add.html  |  5 +++
 app/admin/view/article/edit.html |  5 +++
 app/common/model/Document.php    | 60 +++++++++++++++++---------------
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/app/admin/view/article/add.html b/app/admin/view/article/add.html
index e7d5960..29f774b 100644
--- a/app/admin/view/article/add.html
+++ b/app/admin/view/article/add.html
@@ -259,6 +259,11 @@
                             throw "文章名称不能为空";
                         }
                         break;
+                    case 'alias':
+                        if (item.value && /^\d+$/.test(item.value)) {
+                            throw "别名不能为纯数字";
+                        }
+                        break;
                     case 'cover_path':
                         if (!item.value) {
                             throw "主图不能为空";
diff --git a/app/admin/view/article/edit.html b/app/admin/view/article/edit.html
index 2c9e98d..192426f 100644
--- a/app/admin/view/article/edit.html
+++ b/app/admin/view/article/edit.html
@@ -280,6 +280,11 @@
                             throw "文章名称不能为空";
                         }
                         break;
+                    case 'alias':
+                        if (item.value && /^\d+$/.test(item.value)) {
+                            throw "别名不能为纯数字";
+                        }
+                        break;
                     case 'cover_path':
                         if (!item.value) {
                             throw "主图不能为空";
diff --git a/app/common/model/Document.php b/app/common/model/Document.php
index 6f4ea73..df501db 100644
--- a/app/common/model/Document.php
+++ b/app/common/model/Document.php
@@ -120,6 +120,32 @@ class Document extends BaseModel
                 self::setErrorInfo("别名已存在,请修改后重试");
                 return false;
             }
+            switch ($type) {
+                case Data::DOCUMENT_TYPE_ARTICLE:
+                    $contentData = [
+                        'id' => $data['id'],
+                        'content' => $content
+                    ];
+                    $model = new DocumentArticle();
+                    break;
+                case Data::DOCUMENT_TYPE_PAGE:
+                    $contentData = [
+                        'id' => $data['id'],
+                        'content' => $content
+                    ];
+                    $model = new DocumentPage();
+                    break;
+                case Data::DOCUMENT_TYPE_PRODUCT;
+                    $model = new DocumentProduct();
+                    $contentData = [
+                        'id' => $data['id'],
+                        'content' => $content
+                    ];
+                    break;
+                default:
+                    //默认暂时不处理
+                    break;
+            }
             // 启动事务
             Db::startTrans();
             if (empty($data['id'])) {
@@ -128,11 +154,9 @@ class Document extends BaseModel
                 $data['update_time'] = time();
                 $id = Document::insertGetId($data);
                 if (!empty($content)) {
-                    $updateData = [
-                        'id' => $id,
-                        'content' => $content
-                    ];
-                    DocumentPage::insert($updateData);
+                    //更改默认id
+                    $contentData["id"] = $id;
+                    $model::insert($contentData);
                 }
                 if (!empty($data['tags'])) {
                     $tagModel = new TagModel();
@@ -143,33 +167,11 @@ class Document extends BaseModel
                 if (!$ainfo) return app("json")->fail("数据不存在");
                 Document::where('id', $data['id'])->update($data);
                 if (!empty($content)) {
-                    switch ($type) {
-                        case Data::DOCUMENT_TYPE_ARTICLE:
-                            $updateData = [
-                                'id' => $data['id'],
-                                'content' => $content
-                            ];
-                            $model = new DocumentArticle();
-                            break;
-                        case Data::DOCUMENT_TYPE_PAGE:
-                            $updateData = [
-                                'id' => $data['id'],
-                                'content' => $content
-                            ];
-                            $model = new DocumentPage();
-                            break;
-                        case Data::DOCUMENT_TYPE_PRODUCT;
-                            $mode = new DocumentProduct();
-                            break;
-                        default:
-                            //默认暂时不处理
-                            break;
-                    }
                     $info = $model->find($data['id']);
                     if (!$info) {
-                        $model->insert($updateData);
+                        $model->insert($contentData);
                     } else {
-                        $model->update($updateData);
+                        $model->update($contentData);
                     }
                 }
                 if (!empty($data['tags'])) {