From 04e6a845bf494b6627d6e5f3ae7a400201cf328b Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:25:30 +0000
Subject: [PATCH 01/25] fix:a bug for t_classify

Signed-off-by: IO0288 <admin@io0288.cn>
---
 app/Http/Controllers/ArticleController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index a24ed99..0031c05 100644
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -25,6 +25,7 @@ class ArticleController extends Controller
         }
 
         $article->content = str_replace("`", "\`", $article->content);
+        $classify = DB::table('classify')->get();
         return view('article', ['title'=>$id, 'articles'=>$articles, 'classify'=>$classify, 'id'=>$id]);
     }
     // 文章列表页(主页)
-- 
Gitee


From 74050a08a34a2429d4fa274dd86febfd34d5fce3 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:37:06 +0000
Subject: [PATCH 02/25] fix:a bug for t_classify

Signed-off-by: IO0288 <admin@io0288.cn>
---
 app/Http/Controllers/ArticleController.php | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index 0031c05..7803c99 100644
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -16,15 +16,15 @@ class ArticleController extends Controller
     public function article($id = 'new')
     {
         if ($id == 'new'){
-            $article = DB::table('articles')->orderBy('aid', 'desc')->first();
-            // $article = DB::table('articles')->where('aid', $new->aid)->get();
+            $articles = DB::table('articles')->orderBy('aid', 'desc')->first();
+            // $articles = DB::table('articles')->where('aid', $new->aid)->get();
             $title = '最新文章';
-            $id = $article->aid;
+            $id = $articles->aid;
         }else{
-            $article = DB::table('articles')->where('aid', $id)->first();
+            $articles = DB::table('articles')->where('aid', $id)->first();
         }
 
-        $article->content = str_replace("`", "\`", $article->content);
+        $articles->content = str_replace("`", "\`", $articles->content);
         $classify = DB::table('classify')->get();
         return view('article', ['title'=>$id, 'articles'=>$articles, 'classify'=>$classify, 'id'=>$id]);
     }
@@ -46,8 +46,8 @@ class ArticleController extends Controller
             return response('你还没有登录')->header('refresh', env('USER_WAIT', '5').';url='.env('APP_URL'));
         }
         
-        $articleList = DB::table('articles')->get();
-        return view('admin.article', ['title'=>'文章管理', 'list'=>$articleList]);
+        $articlesList = DB::table('articles')->get();
+        return view('admin.article', ['title'=>'文章管理', 'list'=>$articlesList]);
     }
 
     // 文章删除
@@ -87,7 +87,7 @@ class ArticleController extends Controller
             return response('你还没有登录')->header('refresh', env('USER_WAIT', '5').';url='.env('APP_URL'));
         }
 
-        // $article = DB::table('articles')->where('aid', $id)->first();
+        // $articles = DB::table('articles')->where('aid', $id)->first();
         return view('insert', ['title'=>'文章发布'.$id]);
     }
     // 文章发布处理
@@ -146,7 +146,7 @@ class ArticleController extends Controller
             return response('错误的参数id')->header('refresh', env('USER_WAIT', '5').';url='.env('APP_URL'));
 
         }
-        $article = DB::table('articles')->where('aid', $id)->first();
+        $articles = DB::table('articles')->where('aid', $id)->first();
         $classify = DB::table('classify')->get();
         return view('update', ['title'=>'文章编辑'.$id, 'articles'=>$articles, 'classify'=>$classify]);
     }
@@ -256,15 +256,15 @@ class ArticleController extends Controller
     public function articleAPI($id = 'new')
     {
         if ($id == 'new'){
-            $article = DB::table('articles')->orderBy('aid', 'desc')->first();
-            // $article = DB::table('articles')->where('aid', $new->aid)->get();
+            $articles = DB::table('articles')->orderBy('aid', 'desc')->first();
+            // $articles = DB::table('articles')->where('aid', $new->aid)->get();
             $title = '最新文章';
-            $id = $article->aid;
+            $id = $articles->aid;
         }else{
-            $article = DB::table('articles')->where('aid', $id)->first();
+            $articles = DB::table('articles')->where('aid', $id)->first();
         }
         $classify = DB::table('classify')->get();
 
-        return view('api.article', ['title'=>$id, 'article'=>$article, 'classify'=>$classify, 'id'=>$id]);
+        return view('api.article', ['title'=>$id, 'article'=>$articles, 'classify'=>$classify, 'id'=>$id]);
     }
 }
\ No newline at end of file
-- 
Gitee


From eb317fb465faeb551efcfe33d464edf102be58e6 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:40:44 +0000
Subject: [PATCH 03/25] fix:a bug for t_classify

Signed-off-by: IO0288 <admin@io0288.cn>
---
 app/Http/Controllers/ArticleController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index 7803c99..c4f5491 100644
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -16,17 +16,17 @@ class ArticleController extends Controller
     public function article($id = 'new')
     {
         if ($id == 'new'){
-            $articles = DB::table('articles')->orderBy('aid', 'desc')->first();
+            $article = DB::table('articles')->orderBy('aid', 'desc')->first();
             // $articles = DB::table('articles')->where('aid', $new->aid)->get();
             $title = '最新文章';
-            $id = $articles->aid;
+            $id = $article->aid;
         }else{
-            $articles = DB::table('articles')->where('aid', $id)->first();
+            $article = DB::table('articles')->where('aid', $id)->first();
         }
 
         $articles->content = str_replace("`", "\`", $articles->content);
         $classify = DB::table('classify')->get();
-        return view('article', ['title'=>$id, 'articles'=>$articles, 'classify'=>$classify, 'id'=>$id]);
+        return view('article', ['title'=>$id, 'article'=>$articles, 'classify'=>$classify, 'id'=>$id]);
     }
     // 文章列表页(主页)
     public function articleList()
-- 
Gitee


From bf56ab283d7f65f546a6ab256d11db82280ee277 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:42:43 +0000
Subject: [PATCH 04/25] fix:a bug for t_classify

Signed-off-by: IO0288 <admin@io0288.cn>
---
 app/Http/Controllers/ArticleController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index c4f5491..efc8d3e 100644
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -24,9 +24,9 @@ class ArticleController extends Controller
             $article = DB::table('articles')->where('aid', $id)->first();
         }
 
-        $articles->content = str_replace("`", "\`", $articles->content);
+        $article->content = str_replace("`", "\`", $article->content);
         $classify = DB::table('classify')->get();
-        return view('article', ['title'=>$id, 'article'=>$articles, 'classify'=>$classify, 'id'=>$id]);
+        return view('article', ['title'=>$id, 'article'=>$article, 'classify'=>$classify, 'id'=>$id]);
     }
     // 文章列表页(主页)
     public function articleList()
-- 
Gitee


From 74831e0cd6e929066ea8da91b44933fa355bcc81 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:46:58 +0000
Subject: [PATCH 05/25] =?UTF-8?q?feat:=E5=9C=A8=E6=96=87=E7=AB=A0=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E4=B8=AD=E5=8A=A0=E5=85=A5=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index 192e4a4..fc8d3f8 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -4,11 +4,13 @@
 @php
     // 设置时区
     date_default_timezone_set(env('USER_TIMEZONE', 'PRC'));
+    $classify_kv = array_column(objectToArray($classify), 'cname', 'cid');
+    $cid = $article->cid;
 @endphp
 <br>
 <h1>{{ merge_str($article->title, $article->title2) }}</h1>
 <hr>
-<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date) }}/最后修改于：{{ date("Y-m-d H:i",$article->lastdate) }}</small>
+<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)."/"}} <a>{{ "$cid : $classify_kv[$cid]" }}</a></small>
     @php
         if (session('uEmail', 'null') != 'null') {
             echo '<small class="text-muted"><a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
-- 
Gitee


From e18f1582b28dbf8f18a70c3c4d7797f832b5f68d Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:49:01 +0000
Subject: [PATCH 06/25] =?UTF-8?q?feat:=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E5=8A=A0=E5=85=A5=E5=88=86=E7=B1=BBa=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index fc8d3f8..47ab746 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -10,7 +10,7 @@
 <br>
 <h1>{{ merge_str($article->title, $article->title2) }}</h1>
 <hr>
-<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)."/"}} <a>{{ "$cid : $classify_kv[$cid]" }}</a></small>
+<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)."/"}} <a href="/search?q={{ $cid }}">{{ "$cid : $classify_kv[$cid]" }}</a></small>
     @php
         if (session('uEmail', 'null') != 'null') {
             echo '<small class="text-muted"><a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
-- 
Gitee


From 1b4a0f2487b83fc8ef6381ee805f64fbb6d62eef Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:54:05 +0000
Subject: [PATCH 07/25] =?UTF-8?q?fix:=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

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index 47ab746..6f0c93b 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -10,8 +10,9 @@
 <br>
 <h1>{{ merge_str($article->title, $article->title2) }}</h1>
 <hr>
-<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)."/"}} <a href="/search?q={{ $cid }}">{{ "$cid : $classify_kv[$cid]" }}</a></small>
+<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)."/"}}</small>
     @php
+        echo '<small class="text-muted"><a class="text-info" href="/search?q={{ $cid }}">{{ "$cid : $classify_kv[$cid]" }}</a>|</small>';
         if (session('uEmail', 'null') != 'null') {
             echo '<small class="text-muted"><a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
         }
-- 
Gitee


From 7b147b145eecd731173112cec2ef9cc6c17eff9f Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:54:48 +0000
Subject: [PATCH 08/25] fix:<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index 6f0c93b..639e1f7 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -12,7 +12,7 @@
 <hr>
 <small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)."/"}}</small>
     @php
-        echo '<small class="text-muted"><a class="text-info" href="/search?q={{ $cid }}">{{ "$cid : $classify_kv[$cid]" }}</a>|</small>';
+        echo '<small class="text-muted"><a class="text-info" href="/search?q={{ $cid }}">'."$cid : $classify_kv[$cid]".'</a>|</small>';
         if (session('uEmail', 'null') != 'null') {
             echo '<small class="text-muted"><a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
         }
-- 
Gitee


From 76bfee5fdd5d551ae0250289f656bc62aa59ea62 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:55:19 +0000
Subject: [PATCH 09/25] fix:<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index 639e1f7..d3e590d 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -10,9 +10,9 @@
 <br>
 <h1>{{ merge_str($article->title, $article->title2) }}</h1>
 <hr>
-<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)."/"}}</small>
+<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)." /"}}</small>
     @php
-        echo '<small class="text-muted"><a class="text-info" href="/search?q={{ $cid }}">'."$cid : $classify_kv[$cid]".'</a>|</small>';
+        echo '<small class="text-muted"><a class="text-info" href="/search?q={{ $cid }}">'."$cid : $classify_kv[$cid]".'</a> | </small>';
         if (session('uEmail', 'null') != 'null') {
             echo '<small class="text-muted"><a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
         }
-- 
Gitee


From fdffb17837df283d0e094d3c84c18101a792281d Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Mon, 25 Dec 2023 12:55:56 +0000
Subject: [PATCH 10/25] fix:<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index d3e590d..0415632 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -10,7 +10,7 @@
 <br>
 <h1>{{ merge_str($article->title, $article->title2) }}</h1>
 <hr>
-<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)." /"}}</small>
+<small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)." |"}}</small>
     @php
         echo '<small class="text-muted"><a class="text-info" href="/search?q={{ $cid }}">'."$cid : $classify_kv[$cid]".'</a> | </small>';
         if (session('uEmail', 'null') != 'null') {
-- 
Gitee


From 81644083b31c5b8853b8f2f680969e49c8d9d71c Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 03:28:15 +0000
Subject: [PATCH 11/25] fix:<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index 0415632..90e6f86 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -12,7 +12,7 @@
 <hr>
 <small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)." |"}}</small>
     @php
-        echo '<small class="text-muted"><a class="text-info" href="/search?q={{ $cid }}">'."$cid : $classify_kv[$cid]".'</a> | </small>';
+        echo '<small class="text-muted"><a class="text-info" href="' . '/search?q=' . $cid . '"' . "> $cid : $classify_kv[$cid]".'</a> | </small>';
         if (session('uEmail', 'null') != 'null') {
             echo '<small class="text-muted"><a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
         }
-- 
Gitee


From 6c2f4d41dc879df14c0dfc1049deb3250d68bcde Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:06:04 +0000
Subject: [PATCH 12/25] fix:<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index 90e6f86..dc4eb40 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -12,9 +12,9 @@
 <hr>
 <small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)." |"}}</small>
     @php
-        echo '<small class="text-muted"><a class="text-info" href="' . '/search?q=' . $cid . '"' . "> $cid : $classify_kv[$cid]".'</a> | </small>';
+        echo '<small class="text-muted"><a class="text-info" href="' . '/search?q=' . $cid . '"' . "> $cid : $classify_kv[$cid]".'</a></small>';
         if (session('uEmail', 'null') != 'null') {
-            echo '<small class="text-muted"><a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
+            echo '<small class="text-muted"> | <a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
         }
     @endphp
 <br><br>
-- 
Gitee


From 98a946e58adeaeba9d5f96340985ee63041e4e0a Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:16:54 +0000
Subject: [PATCH 13/25] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E5=85=A8=E5=B1=80=E8=A1=A5=E5=85=85=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=81=9A=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/article/main.blade.php | 2 +-
 resources/views/index.blade.php        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/article/main.blade.php b/resources/views/article/main.blade.php
index dc4eb40..b535fe6 100644
--- a/resources/views/article/main.blade.php
+++ b/resources/views/article/main.blade.php
@@ -12,7 +12,7 @@
 <hr>
 <small class="text-muted">创建于：{{ date("Y-m-d H:i",$article->date)."/最后修改于：".date("Y-m-d H:i",$article->lastdate)." |"}}</small>
     @php
-        echo '<small class="text-muted"><a class="text-info" href="' . '/search?q=' . $cid . '"' . "> $cid : $classify_kv[$cid]".'</a></small>';
+        echo '<small class="text-muted"><a class="text-info" href="/search?q='.$cid.'"' . "> $cid : $classify_kv[$cid]".'</a></small>';
         if (session('uEmail', 'null') != 'null') {
             echo '<small class="text-muted"> | <a class="text-info" href="'.route('update', ['id'=>$id]).'">Edit</a></small>';
         }
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index c80607a..f1c19e2 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -38,6 +38,7 @@
         }
 /* (全局)补充样式 */
         code {background: #eeeeeeaa;}
+        pre {background: #eeeeeeaa;}
     </style>
 </head>
 
-- 
Gitee


From 9d7941b50eb62d3c366cc4a81e8342f86772ad52 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:17:44 +0000
Subject: [PATCH 14/25] fix:<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index f1c19e2..62fc6be 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -37,7 +37,7 @@
             cursor: pointer;
         }
 /* (全局)补充样式 */
-        code {background: #eeeeeeaa;}
+        p>code {background: #eeeeeeaa;}
         pre {background: #eeeeeeaa;}
     </style>
 </head>
-- 
Gitee


From f3a92b3fca8685c4aa7ddc3797b2d1f39542184e Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:23:52 +0000
Subject: [PATCH 15/25] fix:rename table_name<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 app/Http/Controllers/ArticleController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
index efc8d3e..d891da9 100644
--- a/app/Http/Controllers/ArticleController.php
+++ b/app/Http/Controllers/ArticleController.php
@@ -146,9 +146,9 @@ class ArticleController extends Controller
             return response('错误的参数id')->header('refresh', env('USER_WAIT', '5').';url='.env('APP_URL'));
 
         }
-        $articles = DB::table('articles')->where('aid', $id)->first();
+        $article = DB::table('articles')->where('aid', $id)->first();
         $classify = DB::table('classify')->get();
-        return view('update', ['title'=>'文章编辑'.$id, 'articles'=>$articles, 'classify'=>$classify]);
+        return view('update', ['title'=>'文章编辑'.$id, 'article'=>$article, 'classify'=>$classify]);
     }
     // 文章修改处理
     public function updateCheck($id = null)
-- 
Gitee


From ec70ee5737a8cba9e74c6e382a8d26bb3a7d7f75 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:29:03 +0000
Subject: [PATCH 16/25] =?UTF-8?q?feat:=E5=B0=9D=E8=AF=95=E5=9C=A8=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83/=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5uid/cid=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index ced5c98..ab157d0 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -24,11 +24,21 @@
                     value="{{ $article->aid }}" hidden>
             </div>
 
-            <div class="form-group">
+            <div class="form-group col-4">
                 <label >文章Aid</label>
                 <input type="text" class="form-control"
                 value="{{ $article->aid }}" placeholder="自动增长" disabled>
             </div>
+            <div class="form-group col-4">
+                <label >分类Cid</label>
+                <input type="text" class="form-control"
+                value="{{ $article->cid }}" placeholder="默认1">
+            </div>
+            <div class="form-group col-4">
+                <label >用户Uid</label>
+                <input type="text" class="form-control"
+                value="{{ $article->uid }}" placeholder="默认0">
+            </div>
             <div class="form-group">
                 <label for="exampleInputimg1">展示图片</label>
                 <input type="text" class="form-control" id="exampleInputimg1" name="img"
-- 
Gitee


From d173bdacd288022b64c856f2e5b24b742216b8ad Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:31:33 +0000
Subject: [PATCH 17/25] =?UTF-8?q?feat:=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

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 35 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index ab157d0..dc40f49 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -15,29 +15,30 @@
 {{-- <main class="container-fluid">
     @include('admin.main')
 </main> --}}
-<div class="container mt-5">
-    <div class="row">
+<div class="mt-5">
+    <div class="container">
         <form class="col-12" method="POST" action="/adminUpdateCheck">
             @csrf
             <div class="form-group" hidden>
                 <input type="text" class="form-control" id="exampleInputAid" name="aid"
                     value="{{ $article->aid }}" hidden>
             </div>
-
-            <div class="form-group col-4">
-                <label >文章Aid</label>
-                <input type="text" class="form-control"
-                value="{{ $article->aid }}" placeholder="自动增长" disabled>
-            </div>
-            <div class="form-group col-4">
-                <label >分类Cid</label>
-                <input type="text" class="form-control"
-                value="{{ $article->cid }}" placeholder="默认1">
-            </div>
-            <div class="form-group col-4">
-                <label >用户Uid</label>
-                <input type="text" class="form-control"
-                value="{{ $article->uid }}" placeholder="默认0">
+            <div class="row">
+                <div class="form-group col-4">
+                    <label >文章Aid</label>
+                    <input type="text" class="form-control"
+                    value="{{ $article->aid }}" placeholder="自动增长" disabled>
+                </div>
+                <div class="form-group col-4">
+                    <label >分类Cid</label>
+                    <input type="text" class="form-control"
+                    value="{{ $article->cid }}" placeholder="默认1">
+                </div>
+                <div class="form-group col-4">
+                    <label >用户Uid</label>
+                    <input type="text" class="form-control"
+                    value="{{ $article->uid }}" placeholder="默认0">
+                </div>
             </div>
             <div class="form-group">
                 <label for="exampleInputimg1">展示图片</label>
-- 
Gitee


From 5661ef88b8b24f3ed7d51e25b8dadb92f2eebb2e Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:37:48 +0000
Subject: [PATCH 18/25] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E4=BA=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 54 +++++++++++++++++---------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index dc40f49..0032237 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -23,49 +23,53 @@
                 <input type="text" class="form-control" id="exampleInputAid" name="aid"
                     value="{{ $article->aid }}" hidden>
             </div>
-            <div class="row">
-                <div class="form-group col-4">
-                    <label >文章Aid</label>
+            <div class="form-group row">
+                <div class="col-4">
+                    <label>文章Aid</label>
                     <input type="text" class="form-control"
                     value="{{ $article->aid }}" placeholder="自动增长" disabled>
                 </div>
-                <div class="form-group col-4">
-                    <label >分类Cid</label>
-                    <input type="text" class="form-control"
-                    value="{{ $article->cid }}" placeholder="默认1">
+                <div class="col-4">
+                    <label for="cid">分类Cid</label>
+                    <input type="text" class="form-control" name="cid"
+                    value="{{ $article->cid }}" placeholder="默认:1">
                 </div>
-                <div class="form-group col-4">
-                    <label >用户Uid</label>
-                    <input type="text" class="form-control"
-                    value="{{ $article->uid }}" placeholder="默认0">
+                <div class="col-4">
+                    <label for="uid">用户Uid</label>
+                    <input type="text" class="form-control" name="uid"
+                    value="{{ $article->uid }}" placeholder="默认:0">
                 </div>
             </div>
-            <div class="form-group">
-                <label for="exampleInputimg1">展示图片</label>
-                <input type="text" class="form-control" id="exampleInputimg1" name="img"
-                value="{{ $article->img }}" placeholder="url地址或相对地址">
-            </div>
-            <div class="form-group">
-                <label for="exampleInputimgalt1">展示图片Alt</label>
-                <input type="text" class="form-control" id="exampleInputimgalt1" name="img_alt"
-                value="{{ $article->img_alt }}" placeholder="文本">
-            </div>
-            <div class="form-group">
+            <div class="form-group row">
+                <div class="col-6">
+                    <label for="exampleInputimg1">展示图片</label>
+                    <input type="text" class="form-control" id="exampleInputimg1" name="img"
+                    value="{{ $article->img }}" placeholder="url地址或相对地址">
+                </div>
+                <div class="col-6">
+                    <label for="exampleInputimgalt1">展示图片Alt</label>
+                    <input type="text" class="form-control" id="exampleInputimgalt1" name="img_alt"
+                    value="{{ $article->img_alt }}" placeholder="文本">
+                </div>
+            </div">
+            <div class="row form-group">
                 <label for="exampleInputTitle1">标题</label>
                 <input type="text" class="form-control" id="exampleInputTitle1" name="title1"
                     value="{{ $article->title }}">
             </div>
-            <div class="form-group">
+            <div class="row form-group">
                 <label for="exampleInputTitle2">副标题</label>
                 <input type="text" class="form-control" id="exampleInputTitle2" name="title2"
                     value="{{ $article->title2 }}">
             </div>
-            <div class="form-group">
+            <div class="row form-group">
                 <label for="exampleTextareaContent1">内容</label><br>
                 <textarea class="form-control" name="content" id="exampleTextareaContent1" cols="30" rows="10">{{ $article->content }}</textarea>
                 <small id="content" class="form-text text-muted">支持MD语法.</small>
             </div>
-            <button type="submit" class="btn btn-primary">保存并提交</button>
+            <div class="row form-group">
+                <button type="submit" class="btn btn-primary">保存并提交</button>
+            </div>
         </form>
     </div>
 </div>
-- 
Gitee


From bacb391caa126593a4cb5f7efcc8bda1e9568191 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:38:37 +0000
Subject: [PATCH 19/25] fix:<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 0032237..89de269 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -52,22 +52,22 @@
                     value="{{ $article->img_alt }}" placeholder="文本">
                 </div>
             </div">
-            <div class="row form-group">
+            <div class="form-group">
                 <label for="exampleInputTitle1">标题</label>
                 <input type="text" class="form-control" id="exampleInputTitle1" name="title1"
                     value="{{ $article->title }}">
             </div>
-            <div class="row form-group">
+            <div class="form-group">
                 <label for="exampleInputTitle2">副标题</label>
                 <input type="text" class="form-control" id="exampleInputTitle2" name="title2"
                     value="{{ $article->title2 }}">
             </div>
-            <div class="row form-group">
+            <div class="form-group">
                 <label for="exampleTextareaContent1">内容</label><br>
                 <textarea class="form-control" name="content" id="exampleTextareaContent1" cols="30" rows="10">{{ $article->content }}</textarea>
                 <small id="content" class="form-text text-muted">支持MD语法.</small>
             </div>
-            <div class="row form-group">
+            <div class="form-group">
                 <button type="submit" class="btn btn-primary">保存并提交</button>
             </div>
         </form>
-- 
Gitee


From 5539082ffe048d6b5f453a2f1723080016a7ac85 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:39:15 +0000
Subject: [PATCH 20/25] fix:<<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 89de269..e82050b 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -51,23 +51,23 @@
                     <input type="text" class="form-control" id="exampleInputimgalt1" name="img_alt"
                     value="{{ $article->img_alt }}" placeholder="文本">
                 </div>
-            </div">
-            <div class="form-group">
+            </div>
+            <div class="row form-group">
                 <label for="exampleInputTitle1">标题</label>
                 <input type="text" class="form-control" id="exampleInputTitle1" name="title1"
                     value="{{ $article->title }}">
             </div>
-            <div class="form-group">
+            <div class="row form-group">
                 <label for="exampleInputTitle2">副标题</label>
                 <input type="text" class="form-control" id="exampleInputTitle2" name="title2"
                     value="{{ $article->title2 }}">
             </div>
-            <div class="form-group">
+            <div class="row form-group">
                 <label for="exampleTextareaContent1">内容</label><br>
                 <textarea class="form-control" name="content" id="exampleTextareaContent1" cols="30" rows="10">{{ $article->content }}</textarea>
                 <small id="content" class="form-text text-muted">支持MD语法.</small>
             </div>
-            <div class="form-group">
+            <div class="row form-group">
                 <button type="submit" class="btn btn-primary">保存并提交</button>
             </div>
         </form>
-- 
Gitee


From a9b060ddd44db084662a67be510104d4ea2997a4 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:40:57 +0000
Subject: [PATCH 21/25] fix:<<<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index e82050b..0396845 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -52,22 +52,22 @@
                     value="{{ $article->img_alt }}" placeholder="文本">
                 </div>
             </div>
-            <div class="row form-group">
+            <div class="form-group row col-12">
                 <label for="exampleInputTitle1">标题</label>
                 <input type="text" class="form-control" id="exampleInputTitle1" name="title1"
                     value="{{ $article->title }}">
             </div>
-            <div class="row form-group">
+            <div class="form-group row col-12">
                 <label for="exampleInputTitle2">副标题</label>
                 <input type="text" class="form-control" id="exampleInputTitle2" name="title2"
                     value="{{ $article->title2 }}">
             </div>
-            <div class="row form-group">
+            <div class="form-group row col-12">
                 <label for="exampleTextareaContent1">内容</label><br>
                 <textarea class="form-control" name="content" id="exampleTextareaContent1" cols="30" rows="10">{{ $article->content }}</textarea>
                 <small id="content" class="form-text text-muted">支持MD语法.</small>
             </div>
-            <div class="row form-group">
+            <div class="form-group row">
                 <button type="submit" class="btn btn-primary">保存并提交</button>
             </div>
         </form>
-- 
Gitee


From a3e3848f199539383da0392b5cd9c711d06b841e Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:47:37 +0000
Subject: [PATCH 22/25] fix:<<<<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 0396845..94ac93d 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -69,6 +69,7 @@
             </div>
             <div class="form-group row">
                 <button type="submit" class="btn btn-primary">保存并提交</button>
+                <button type="button" onclick="javascript:location.replace(document.referrer);" class="btn btn-warning text-light">返回</button>
             </div>
         </form>
     </div>
-- 
Gitee


From b6b0d4800d6488beb3285a0f15a4298e0b883760 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:48:30 +0000
Subject: [PATCH 23/25] fix:<<<<<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index 94ac93d..e8adac4 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -37,7 +37,7 @@
                 <div class="col-4">
                     <label for="uid">用户Uid</label>
                     <input type="text" class="form-control" name="uid"
-                    value="{{ $article->uid }}" placeholder="默认:0">
+                    value="{{ $article->uid }}" placeholder="默认:1" disabled>
                 </div>
             </div>
             <div class="form-group row">
-- 
Gitee


From 6eb9f4c3b5b527785c8581d5cda08759507b68b4 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:51:14 +0000
Subject: [PATCH 24/25] fix:<<<<<<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/update.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php
index e8adac4..95b409f 100644
--- a/resources/views/update.blade.php
+++ b/resources/views/update.blade.php
@@ -67,7 +67,7 @@
                 <textarea class="form-control" name="content" id="exampleTextareaContent1" cols="30" rows="10">{{ $article->content }}</textarea>
                 <small id="content" class="form-text text-muted">支持MD语法.</small>
             </div>
-            <div class="form-group row">
+            <div class="form-group">
                 <button type="submit" class="btn btn-primary">保存并提交</button>
                 <button type="button" onclick="javascript:location.replace(document.referrer);" class="btn btn-warning text-light">返回</button>
             </div>
-- 
Gitee


From 0053432fb9e912de5540876a756adc3ed0a548d9 Mon Sep 17 00:00:00 2001
From: IO0288 <admin@io0288.cn>
Date: Tue, 26 Dec 2023 04:55:27 +0000
Subject: [PATCH 25/25] fix:<<<<<<<

Signed-off-by: IO0288 <admin@io0288.cn>
---
 resources/views/admin/updatapwd.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/admin/updatapwd.blade.php b/resources/views/admin/updatapwd.blade.php
index 6a0e653..542464d 100644
--- a/resources/views/admin/updatapwd.blade.php
+++ b/resources/views/admin/updatapwd.blade.php
@@ -25,7 +25,6 @@
     <div class="row">
         <form class="col-4 offset-4" method="POST" action="/updatepwd/check">
             @csrf
-
             <div class="form-group">
                 <label for="exampleInputEmail1">用户</label>
                 <input type="text" class="form-control" id="exampleInputEmail1" name="uEmail"
@@ -34,13 +33,14 @@
             <div class="form-group">
                 <label for="exampleInputPassword1">旧密码</label>
                 <input type="password" class="form-control" id="exampleInputPassword1" name="uOldPwd">
-                <small id="password" class="form-text text-muted">填写自己帐号的原有密码.</small>
+                <small class="form-text text-muted">填写自己帐号的原有密码.</small>
             </div>
             <div class="form-group">
                 <label for="exampleInputPassword2">新密码</label>
                 <input type="password" class="form-control" id="exampleInputPassword2" name="uNewPwd">
+                <small class="form-text text-muted">输入新密码.</small>
             </div>
-            <button type="submit" class="btn btn-primary">确认保存</button>
+            <button type="submit" class="btn btn-primary">确认提交</button>
         </form>
     </div>
 </div>
-- 
Gitee