From b753676fbf3d6bbc9e5559fafcb653c9e795982b Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 5 Jul 2023 17:04:16 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=BC=8F=E6=B4=9E=E8=A1=A5=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cookie设置位置错误导致Laravel进行throw Exceptions Signed-off-by: XiaoLFeng --- app/Http/Controllers/Function/Link.php | 6 +- resources/views/function/edit-check.blade.php | 62 +++---------------- 2 files changed, 12 insertions(+), 56 deletions(-) diff --git a/app/Http/Controllers/Function/Link.php b/app/Http/Controllers/Function/Link.php index f60de43..40b4f7b 100644 --- a/app/Http/Controllers/Function/Link.php +++ b/app/Http/Controllers/Function/Link.php @@ -445,7 +445,6 @@ public function apiCustomBlogVerify(HttpRequest $request): JsonResponse ]); // 验证数据是否合法 if (!$dataCheck->fails()) { - $cookie = cookie('friend_edit', '', -1, '/'); // 检查内容是否存在 $resultBlog = DB::table('blog_link') ->select('id', 'blogOwnEmail') @@ -479,6 +478,8 @@ public function apiCustomBlogVerify(HttpRequest $request): JsonResponse 'id' => $resultBlog->id ], ]; + return Response::json($returnData, $returnData['code']) + ->cookie($cookie); } else { // 验证码验证失败 $returnData = [ @@ -539,8 +540,7 @@ public function apiCustomBlogVerify(HttpRequest $request): JsonResponse ], ]; } - return Response::json($returnData, $returnData['code']) - ->cookie($cookie); + return Response::json($returnData, $returnData['code']); } protected function viewEditFriend(HttpRequest $request, $friendId): Application|Factory|View|RedirectResponse diff --git a/resources/views/function/edit-check.blade.php b/resources/views/function/edit-check.blade.php index a1ee5b5..e96d4f6 100644 --- a/resources/views/function/edit-check.blade.php +++ b/resources/views/function/edit-check.blade.php @@ -21,58 +21,6 @@ class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translat style="clip-path: polygon(74.1% 44.1%, 100% 61.6%, 97.5% 26.9%, 85.5% 0.1%, 80.7% 2%, 72.5% 32.5%, 60.2% 62.4%, 52.4% 68.1%, 47.5% 58.3%, 45.2% 34.5%, 27.5% 76.7%, 0.1% 64.9%, 17.9% 100%, 27.6% 76.8%, 76.1% 97.7%, 74.1% 44.1%)">
-
- - - -
- - -
-
-
-
@@ -250,6 +198,9 @@ class Check { success: function (returnData) { if (returnData.output === "Success") { Toast.toggle(returnData.data.message, ''); + $('#sendCheckCode').prop('disabled', true); + $('#sendCheckCode').removeClass('bg-green-700').addClass('bg-green-800'); + $('#sendCheckCode').html('验证通过'); setTimeout(function () { location.href = '{{ route('function.edit-friend','') }}/' + returnData.data.id @@ -261,7 +212,12 @@ class Check { } }, error: function (returnData) { - Toast.toggle(returnData.responseJSON.data.message, '') + Toast.set('其他错误', ''); + if (returnData.responseJSON.output !== 'SendingTimeTooFast') { + Toast.toggle(returnData.responseJSON.data.message, ''); + $('#sendCheckCode').prop('disabled', false); + $('#sendCheckCode').html('验证'); + } } }); } From f78e62a85b3cea4f1d21abbc1585ef22521f22aa Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 5 Jul 2023 17:13:20 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=99=A4=E5=8E=BB=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除了搜索栏忘记删除搜索栏所配置的JavaScript Signed-off-by: XiaoLFeng --- resources/views/function/edit-check.blade.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/views/function/edit-check.blade.php b/resources/views/function/edit-check.blade.php index e96d4f6..472cda1 100644 --- a/resources/views/function/edit-check.blade.php +++ b/resources/views/function/edit-check.blade.php @@ -109,18 +109,6 @@ class="z-[9999] fixed top-5 left-5 hidden items-center w-full max-w-xs p-4 space + + +{!! $webFooter !!} + From 1152134553f19d4ef60e81cab0c136ea8eb7b6b8 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 5 Jul 2023 17:36:15 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加返回按钮，优化返回上一级返回体验，修复unemail逻辑访问语序 Signed-off-by: XiaoLFeng --- resources/views/function/edit-check.blade.php | 8 ++++++++ resources/views/function/edit-friend.blade.php | 8 ++++++++ resources/views/function/edit-unemail.blade.php | 12 ++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/resources/views/function/edit-check.blade.php b/resources/views/function/edit-check.blade.php index 472cda1..c6d17db 100644 --- a/resources/views/function/edit-check.blade.php +++ b/resources/views/function/edit-check.blade.php @@ -21,6 +21,14 @@ class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translat style="clip-path: polygon(74.1% 44.1%, 100% 61.6%, 97.5% 26.9%, 85.5% 0.1%, 80.7% 2%, 72.5% 32.5%, 60.2% 62.4%, 52.4% 68.1%, 47.5% 58.3%, 45.2% 34.5%, 27.5% 76.7%, 0.1% 64.9%, 17.9% 100%, 27.6% 76.8%, 76.1% 97.7%, 74.1% 44.1%)">
+
+ + + 返回友链搜索 + +
diff --git a/resources/views/function/edit-friend.blade.php b/resources/views/function/edit-friend.blade.php index 39dce30..c026677 100644 --- a/resources/views/function/edit-friend.blade.php +++ b/resources/views/function/edit-friend.blade.php @@ -21,6 +21,14 @@ class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translat style="clip-path: polygon(74.1% 44.1%, 100% 61.6%, 97.5% 26.9%, 85.5% 0.1%, 80.7% 2%, 72.5% 32.5%, 60.2% 62.4%, 52.4% 68.1%, 47.5% 58.3%, 45.2% 34.5%, 27.5% 76.7%, 0.1% 64.9%, 17.9% 100%, 27.6% 76.8%, 76.1% 97.7%, 74.1% 44.1%)">
+
+ + + 返回友链搜索 + +

自助友链修改系统

diff --git a/resources/views/function/edit-unemail.blade.php b/resources/views/function/edit-unemail.blade.php index 3b8afc4..5043d11 100644 --- a/resources/views/function/edit-unemail.blade.php +++ b/resources/views/function/edit-unemail.blade.php @@ -21,9 +21,17 @@ class="relative left-[calc(50%-11rem)] aspect-[1155/678] w-[36.125rem] -translat style="clip-path: polygon(74.1% 44.1%, 100% 61.6%, 97.5% 26.9%, 85.5% 0.1%, 80.7% 2%, 72.5% 32.5%, 60.2% 62.4%, 52.4% 68.1%, 47.5% 58.3%, 45.2% 34.5%, 27.5% 76.7%, 0.1% 64.9%, 17.9% 100%, 27.6% 76.8%, 76.1% 97.7%, 74.1% 44.1%)">
+
+ + + 返回友链搜索 + +
-
+

身份无法验证

@@ -34,7 +42,7 @@ class="col-span-10 lg:col-span-7 items-center justify-center rounded bg-gray-50 ）进行修改

- From 31160bf729e691f23915433dbbe2991cb7d1474c Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 5 Jul 2023 17:36:38 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 路由表意外格式修复内容 Signed-off-by: XiaoLFeng --- routes/web.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routes/web.php b/routes/web.php index d3e3e34..0237933 100644 --- a/routes/web.php +++ b/routes/web.php @@ -30,9 +30,9 @@ Route::prefix('function')->group(function () { Route::get('link',[UserLink::class, 'viewLink'])->name('function.link'); - Route::get('make-friend',[UserLink::class, 'viewMakeFriend'])->name('function.make-friend'); - Route::get ('edit-search',[UserLink::class, 'viewSearchFriends'])->name('function.edit-search'); - Route::get('edit-search/{friendId}',[UserLink::class,'viewSearchFriend'])->name('function.edit-searchOnly'); + Route::get('make-friend', [UserLink::class, 'viewMakeFriend'])->name('function.make-friend'); + Route::get('edit-search', [UserLink::class, 'viewSearchFriends'])->name('function.edit-search'); + Route::get('edit-search/{friendId}', [UserLink::class, 'viewSearchFriend'])->name('function.edit-searchOnly'); Route::get('edit-friend/{friendId}',[UserLink::class,'viewEditFriend'])->name('function.edit-friend'); Route::get('sponsor',function () { return view('function.sponsor'); From a8b1e33de45bb207f6fdad91f5c1193ece25d403 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 5 Jul 2023 18:16:33 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9Link=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 遵循开发规则以及标准JavaDoc编写守则 Signed-off-by: XiaoLFeng --- app/Http/Controllers/Function/Link.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Function/Link.php b/app/Http/Controllers/Function/Link.php index 70cd91c..eb7e2a4 100644 --- a/app/Http/Controllers/Function/Link.php +++ b/app/Http/Controllers/Function/Link.php @@ -40,10 +40,12 @@ public function __construct() */ public function apiCustomAdd(HttpRequest $request): JsonResponse { - /** @var array $returnData Json的 return 返回值 */ - /** @var Validator $dataCheck 数据判断 */ - /** @var array $errorInfo 错误信息 */ - /** @var array $errorSingle 输出单个错误信息 */ + /** + * @var array $returnData Json的 return 返回值 + * @var Validator $dataCheck 数据判断 + * @var array $errorInfo 错误信息 + * @var array $errorSingle 输出单个错误信息 + */ // 检查数据 $dataCheck = Validator::make($request->all(), [ 'userEmail' => 'required|email', @@ -435,8 +437,10 @@ private function apiCustomBlogCheckSendEmail(): void */ public function apiCustomBlogVerify(HttpRequest $request): JsonResponse { - /** @var array $returnData Json的 return 返回值 */ - /** @var mixed $cookie 保存Cookie数据 */ + /** + * @var array $returnData Json的 return 返回值 + * @var mixed $cookie 保存Cookie数据 + */ //数据验证 $dataCheck = Validator::make($request->all(), [ 'id' => 'required|int', @@ -586,14 +590,14 @@ protected function viewEditFriend(HttpRequest $request, $friendId): Application| } } - protected function viewLink(HttpRequest $request): Factory|View|Application + protected function viewLink(): Factory|View|Application { $this->data['webSubTitle'] = '友链'; - $this->GetFriendsLink($this->data); + $this->getFriendsLink($this->data); return view('function.link', $this->data); } - private function GetFriendsLink(array &$data): void + private function getFriendsLink(array &$data): void { $data['blogLink'] = DB::table('blog_link')->whereNotIn('blog_link.blogLocation', [0])->get()->toArray(); $data['blogSort'] = DB::table('blog_sort')->orderBy('blog_sort.sort')->get()->toArray(); From 3612f238426e479d943372a39d30c4a31060882e Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 5 Jul 2023 23:06:04 +0800 Subject: [PATCH 08/11] =?UTF-8?q?BugFix=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=81=97=E6=BC=8F=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 遗漏插入 blogServeHost 内容 Signed-off-by: XiaoLFeng --- app/Http/Controllers/Function/Link.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Function/Link.php b/app/Http/Controllers/Function/Link.php index eb7e2a4..9e029af 100644 --- a/app/Http/Controllers/Function/Link.php +++ b/app/Http/Controllers/Function/Link.php @@ -112,6 +112,7 @@ public function apiCustomAdd(HttpRequest $request): JsonResponse 'blogUserLocation' => $request->userLocation, 'blogSetColor' => $request->userSelColor, 'blogRemark' => $request->userRemark, + 'blogServerHost' => $request->userServerHost, ]); if ($insertData) { // 邮件发送系统 From 5f0fa57c9102a368119c9af3991deb27c57e4961 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sat, 8 Jul 2023 16:37:57 +0800 Subject: [PATCH 09/11] =?UTF-8?q?AddDevelop=EF=BC=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加数据库恢复备份功能，后期将会移除 Signed-off-by: XiaoLFeng --- app/Http/Controllers/DataBase.php | 40 +++++++++++++++++++++++++++++++ routes/web.php | 3 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 app/Http/Controllers/DataBase.php diff --git a/app/Http/Controllers/DataBase.php b/app/Http/Controllers/DataBase.php new file mode 100644 index 0000000..fc73829 --- /dev/null +++ b/app/Http/Controllers/DataBase.php @@ -0,0 +1,40 @@ +orderBy('id') + ->get() + ->toArray(); + foreach ($result as $value) { + $value->blog_rss_judge ? $value->blog_rss_judge = 1 : $value->blog_rss_judge = 0; + DB::table('blog_link') + ->insert([ + 'blogName' => $value->blog_name, + 'blogUrl' => $value->blog_url, + 'blogDescription' => $value->blog_introduce, + 'blogOwnEmail' => $value->blog_owner_email, + 'blogIcon' => $value->blog_icon, + 'blogRssJudge' => $value->blog_rss_judge, + 'blogRSS' => $value->blog_rss, + 'blogServerHost' => $value->blog_serverhost, + 'blogLocation' => $value->blog_location, + 'blogSetColor' => $value->blog_sel_color, + 'created_at' => date('Y-m-d H:i:s'), + ]); + } + } +} diff --git a/routes/web.php b/routes/web.php index 0237933..3d326f6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -26,7 +26,8 @@ */ Route::get('/', [Index::class,'ViewIndex'])->name('home'); -Route::get('about',[Index::class,'ViewAboutMe'])->name('about'); +Route::get('about', [Index::class, 'ViewAboutMe'])->name('about'); +Route::get('backup', [\App\Http\Controllers\DataBase::class, '__construct']); Route::prefix('function')->group(function () { Route::get('link',[UserLink::class, 'viewLink'])->name('function.link'); From 65e29d7436512bf50e0ae4031bb70f2957f695e1 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sat, 8 Jul 2023 16:40:14 +0800 Subject: [PATCH 10/11] =?UTF-8?q?EditFeature=EF=BC=9A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复获取RSS内容，以及跳转URL内容 Signed-off-by: XiaoLFeng --- resources/views/function/edit-friend.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/function/edit-friend.blade.php b/resources/views/function/edit-friend.blade.php index c026677..e01ef71 100644 --- a/resources/views/function/edit-friend.blade.php +++ b/resources/views/function/edit-friend.blade.php @@ -164,7 +164,7 @@ class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-w
+ @if($blog->blogRssJudge == 0)disabled @endif>
@@ -361,7 +361,7 @@ function ajax() { async: true, method: "POST", data: $('#FormData').serialize(), - url: '{{ route('api.link.custom.add') }}', + url: '{{ route('api.link.custom.edit', $blog->id) }}', dataType: "json", success: function (returnData) { if (returnData.output === "Success") { From d2c2b9ca8bed78547745de2c87c403d5d2ab6639 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Sat, 8 Jul 2023 16:43:39 +0800 Subject: [PATCH 11/11] =?UTF-8?q?AddFeature=EF=BC=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8B=E9=93=BEAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加接口 apiCustomEdit 修改友链API 设计接口路由表 添加修改发送邮件 Signed-off-by: XiaoLFeng --- app/Http/Controllers/Function/Link.php | 190 ++++++++++++++++++ .../mail/link-custom-edit-admin.blade.php | 84 ++++++++ .../views/mail/link-custom-edit.blade.php | 86 ++++++++ routes/api.php | 5 +- 4 files changed, 363 insertions(+), 2 deletions(-) create mode 100644 resources/views/mail/link-custom-edit-admin.blade.php create mode 100644 resources/views/mail/link-custom-edit.blade.php diff --git a/app/Http/Controllers/Function/Link.php b/app/Http/Controllers/Function/Link.php index 9e029af..43b2e06 100644 --- a/app/Http/Controllers/Function/Link.php +++ b/app/Http/Controllers/Function/Link.php @@ -548,6 +548,196 @@ public function apiCustomBlogVerify(HttpRequest $request): JsonResponse return Response::json($returnData, $returnData['code']); } + /** + * 修改友链API + * + * @param HttpRequest $request 获取HTTP中 Request 数据 + * @return JsonResponse 返回JSON数据 + */ + public function apiCustomEdit(HttpRequest $request, string $friendId): JsonResponse + { + /** + * @var array $returnData Json的 return 返回值 + * @var Validator $dataCheck 数据判断 + * @var array $errorInfo 错误信息 + * @var array $errorSingle 输出单个错误信息 + */ + // 验证Cookie是否有效 + if ($request->hasCookie('friend_edit')) { + // 检查Cookie解析是否为此博客 + if (password_verify($friendId, $request->cookie('friend_edit'))) { + // 获取数据库 + $resultBlog = DB::table('blog_link') + ->find($friendId); + if (!empty($resultBlog->id)) { + // 检查数据 + $dataCheck = Validator::make($request->all(), [ + 'userEmail' => 'required|email', + 'userServerHost' => 'required|string', + 'userBlog' => 'required|string', + 'userUrl' => 'required|regex:#[a-zA-z]+://[^\s]*#', + 'userDescription' => 'required|string', + 'userIcon' => 'required|regex:#[a-zA-z]+://[^\s]*#', + 'checkRssJudge' => 'boolean', + 'userRss' => 'string|regex:#[a-zA-z]+://[^\s]*#', + 'userSelColor' => 'required|int', + 'userRemark' => 'string', + ]);// 检查发现错误 + if ($dataCheck->fails()) { + $errorType = array_keys($dataCheck->failed()); + $i = 0; + foreach ($dataCheck->failed() as $valueData) { + $errorInfo[$errorType[$i]] = array_keys($valueData); + if ($i == 0) { + $errorSingle = [ + 'info' => $errorType[$i], + 'need' => $errorInfo[$errorType[$i]], + ]; + } + $i++; + } + $returnData = [ + 'output' => 'DataFormatError', + 'code' => 403, + 'data' => [ + 'message' => '输入内容有错误', + 'errorSingle' => $errorSingle, + 'error' => $errorInfo, + ], + ]; + } else { + // 检查数据 + if (empty($request->checkRssJudge)) { + $request->checkRssJudge = 0; + } + // 数据载入数组 + $this->data['oldBlog'] = (object)[ + 'blogOwnEmail' => $resultBlog->blogOwnEmail, + 'blogUrl' => $resultBlog->blogUrl, + 'blogName' => $resultBlog->blogName, + 'blogDescription' => $resultBlog->blogDescription, + 'blogIcon' => $resultBlog->blogIcon, + 'blogRssJudge' => $resultBlog->blogRssJudge, + 'blogRSS' => $resultBlog->blogRSS, + 'blogSetColor' => $resultBlog->blogSetColor, + 'blogRemark' => $resultBlog->blogRemark, + 'blogServerHost' => $resultBlog->blogServerHost, + ]; + $this->data['blog'] = (object)[ + 'blogOwnEmail' => $request->userEmail, + 'blogUrl' => $request->userUrl, + 'blogName' => $request->userBlog, + 'blogDescription' => $request->userDescription, + 'blogIcon' => $request->userIcon, + 'blogRssJudge' => $request->checkRssJudge, + 'blogRSS' => $request->userRss, + 'blogSetColor' => $request->userSelColor, + 'blogRemark' => $request->userRemark, + 'blogServerHost' => $request->userServerHost, + ]; + + // 修改数据 + $updateData = DB::table('blog_link') + ->where('id', $resultBlog->id) + ->update([ + 'blogOwnEmail' => $request->userEmail, + 'blogUrl' => $request->userUrl, + 'blogName' => $request->userBlog, + 'blogDescription' => $request->userDescription, + 'blogIcon' => $request->userIcon, + 'blogRssJudge' => $request->checkRssJudge, + 'blogRSS' => $request->userRss, + 'blogSetColor' => $request->userSelColor, + 'blogRemark' => $request->userRemark, + 'blogServerHost' => $request->userServerHost, + 'updated_at' => date('Y-m-d H:i:s'), + ]); + + if ($updateData) { + // 邮件发送系统 + // 新用户 + if ($this->data['oldBlog']->blogOwnEmail != $this->data['blog']->blogOwnEmail) { + $this->data['sendEmail'] = [ + 'userEmail' => $this->data['blog']->blogOwnEmail, + 'userBlog' => $this->data['blog']->blogName, + 'userUrl' => $this->data['blog']->blogUrl, + ]; + Mail::send('mail.link-custom-edit', $this->data, function (Message $mail) { + $mail->from(env('MAIL_USERNAME'), env('APP_NAME')); + $mail->to($this->data['sendEmail']['userEmail']); + $mail->subject(env('APP_NAME') . '-友链自主修改通知'); + }); + } + $this->data['sendEmail'] = [ + 'userEmail' => $this->data['oldBlog']->blogOwnEmail, + 'userBlog' => $this->data['oldBlog']->blogName, + 'userUrl' => $this->data['oldBlog']->blogUrl, + ]; + // 用户 + Mail::send('mail.link-custom-edit', $this->data, function (Message $mail) { + $mail->from(env('MAIL_USERNAME'), env('APP_NAME')); + $mail->to($this->data['sendEmail']['userEmail']); + $mail->subject(env('APP_NAME') . '-友链自主修改通知'); + }); + // 站长 + Mail::send('mail.link-custom-edit-admin', $this->data, function (Message $mail) { + $mail->from(env('MAIL_USERNAME'), env('APP_NAME')); + $mail->to($this->data['sqlEmail']); + $mail->subject(env('APP_NAME') . '-友链自主修改通知'); + }); + + // 消息成功通知 + $returnData = [ + 'output' => 'Success', + 'code' => 200, + 'data' => [ + 'message' => '您已成功修改', + ], + ]; + $cookie = cookie('friend_edit', '', -1, '/'); + return Response::json($returnData, $returnData['code']) + ->cookie($cookie); + } else { + $returnData = [ + 'output' => 'UpdateFail', + 'code' => 403, + 'data' => [ + 'message' => '更新失败请联系管理员', + ], + ]; + } + } + } else { + $returnData = [ + 'output' => 'NoBlog', + 'code' => 403, + 'data' => [ + 'message' => '没有对应博客', + ], + ]; + } + } else { + $returnData = [ + 'output' => 'Mismatch', + 'code' => 403, + 'data' => [ + 'message' => '不匹配', + ], + ]; + } + } else { + $returnData = [ + 'output' => 'InvalidValidation', + 'code' => 403, + 'data' => [ + 'message' => '无效验证', + ], + ]; + } + + return Response::json($returnData, $returnData['code']); + } + protected function viewEditFriend(HttpRequest $request, $friendId): Application|Factory|View|RedirectResponse { // 检查内容是否为空 diff --git a/resources/views/mail/link-custom-edit-admin.blade.php b/resources/views/mail/link-custom-edit-admin.blade.php new file mode 100644 index 0000000..44db8f2 --- /dev/null +++ b/resources/views/mail/link-custom-edit-admin.blade.php @@ -0,0 +1,84 @@ + + + + + Mail + + + + + + + + + + + + +
{{ env('APP_NAME') }}
+ + + + + + + + + + +
+ 时间： {{ date('Y-m-d H:i:s') }} +
+ Dear. {{ $sqlEmail }} +
+ 您好站长：{{ $sqlAuthor }}
+ 本站友链（{{ $oldBlog->blogName }}）已自行修改
+ 请检查修改问题确保无误！ +
+ 这是您以前的信息：
+
    +
  • 博主邮箱：{{ $blog->blogOwnEmail }}
    • +
  • 贵站名字：{{ $blog->blogName }}
    • +
  • 贵站地址：{{ $blog->blogUrl }}
    • +
  • 图片地址：{{ $blog->blogIcon }}
    • +
  • 贵站介绍：{{ $blog->blogDescription }}
    • + @if(!empty($blog->blogRemark)) +
  • 备注内容：{{ $blog->blogRemark }}
    • + @endif + @if($blog->blogRssJudge == 1) +
  • RSS地址：{{ $blog->blogRSS }}
    • + @endif +
+
+ 这是您的修改信息：
+
    +
  • 博主邮箱：{{ $oldBlog->blogOwnEmail }}
    • +
  • 贵站名字：{{ $oldBlog->blogName }}
    • +
  • 贵站地址：{{ $oldBlog->blogUrl }}
    • +
  • 图片地址：{{ $oldBlog->blogIcon }}
    • +
  • 贵站介绍：{{ $oldBlog->blogDescription }}
    • + @if(!empty($oldBlog->blogRemark)) +
  • 备注内容：{{ $oldBlog->blogRemark }}
    • + @endif + @if($oldBlog->blogRssJudge == 1) +
  • RSS地址：{{ $oldBlog->blogRSS }}
    • + @endif +
+
+ 此邮件为凭证，若发生意外修改请使用此邮件提交于站长！谢谢您对本站的支持！
+
+
+ + + + +
+ © 2022 - {{ date('Y') }}. {{ env('APP_NAME') }} All Rights Reserved.
+ 本邮件为自动发出，请勿直接回复 +
+
+ + + + diff --git a/resources/views/mail/link-custom-edit.blade.php b/resources/views/mail/link-custom-edit.blade.php new file mode 100644 index 0000000..2a6f48a --- /dev/null +++ b/resources/views/mail/link-custom-edit.blade.php @@ -0,0 +1,86 @@ + + + + + Mail + + + + + + + + + + + + +
{{ env('APP_NAME') }}
+ + + + + + + + + + +
+ 时间： {{ date('Y-m-d H:i:s') }} +
+ Dear. {{ $sendEmail['userEmail'] }} +
+ 您好 {{ $sendEmail['userBlog'] }} 的站长： + {{ $sendEmail['userEmail'] }}
+ 您在本博客（{{ env('APP_NAME') }}）自主修改友链
+ 邮件为通知您您已成功修改友链，修改立即生效，我们告知您已做出了修改，若您未执行修改请立刻联系站长 + {{ $sqlAuthor }}({{ $sqlEmail }}) +
+ 这是您现在的信息：
+
    +
  • 博主邮箱：{{ $blog->blogOwnEmail }}
    • +
  • 贵站名字：{{ $blog->blogName }}
    • +
  • 贵站地址：{{ $blog->blogUrl }}
    • +
  • 图片地址：{{ $blog->blogIcon }}
    • +
  • 贵站介绍：{{ $blog->blogDescription }}
    • + @if(!empty($blog->blogRemark)) +
  • 备注内容：{{ $blog->blogRemark }}
    • + @endif + @if($blog->blogRssJudge == 1) +
  • RSS地址：{{ $blog->blogRSS }}
    • + @endif +
+
+ 这是您以前的修改信息：
+
    +
  • 博主邮箱：{{ $oldBlog->blogOwnEmail }}
    • +
  • 贵站名字：{{ $oldBlog->blogName }}
    • +
  • 贵站地址：{{ $oldBlog->blogUrl }}
    • +
  • 图片地址：{{ $oldBlog->blogIcon }}
    • +
  • 贵站介绍：{{ $oldBlog->blogDescription }}
    • + @if(!empty($oldBlog->blogRemark)) +
  • 备注内容：{{ $oldBlog->blogRemark }}
    • + @endif + @if($oldBlog->blogRssJudge == 1) +
  • RSS地址：{{ $oldBlog->blogRSS }}
    • + @endif +
+
+ 此邮件为凭证，若发生意外修改请使用此邮件提交于站长！谢谢您对本站的支持！
+
+
+ + + + +
+ © 2022 - {{ date('Y') }}. {{ env('APP_NAME') }} All Rights Reserved.
+ 本邮件为自动发出，请勿直接回复 +
+
+ + + + diff --git a/routes/api.php b/routes/api.php index 1ee2714..dc6accf 100644 --- a/routes/api.php +++ b/routes/api.php @@ -43,8 +43,9 @@ }); Route::prefix('custom')->group(function () { - Route::post('add',[Link::class,'apiCustomAdd'])->name('api.link.custom.add'); - Route::get('search',[Link::class, 'apiCustomSearch'])->name('api.link.custom.search'); + Route::post('add', [Link::class, 'apiCustomAdd'])->name('api.link.custom.add'); + Route::post('edit/{friendId}', [Link::class, 'apiCustomEdit'])->name('api.link.custom.edit'); + Route::get('search', [Link::class, 'apiCustomSearch'])->name('api.link.custom.search'); Route::post('blogCheck',[Link::class,'apiCustomBlogCheck'])->name('api.link.custom.blogCheck'); Route::post('blogVerify',[Link::class,'apiCustomBlogVerify'])->name('api.link.custom.blogVerify'); });