From 88d030e6c4fb1e1bc32c279cdec69c631085df71 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Wed, 12 Feb 2025 10:20:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8E=BB=E9=99=A4=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=84=9F=E5=8F=B9?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/v1/Captcha.php | 2 +- app/admin/controller/v1/Login.php | 14 ++++---- app/admin/controller/v1/ProductCategory.php | 36 ++++++++++----------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/admin/controller/v1/Captcha.php b/app/admin/controller/v1/Captcha.php index 91edd478..25526190 100644 --- a/app/admin/controller/v1/Captcha.php +++ b/app/admin/controller/v1/Captcha.php @@ -24,7 +24,7 @@ class Captcha Cache::store('redis')->set('captcha:token.' . $token, $hash, Config::get('captcha.expire')); // 输出验证码 - return success('获取验证码成功！', [ + return success('获取验证码成功', [ 'token' => $token, 'captcha' => $captcha["img"], ]); diff --git a/app/admin/controller/v1/Login.php b/app/admin/controller/v1/Login.php index 9d61bfd9..ec0c4650 100644 --- a/app/admin/controller/v1/Login.php +++ b/app/admin/controller/v1/Login.php @@ -37,36 +37,36 @@ class Login // 校验验证码 $code = Cache::get('captcha:token.' . $post['token']); if (!$code) { - throw new InvalidLoginException('验证码不存在或已过期！'); + throw new InvalidLoginException('验证码不存在或已过期'); } Cache::delete('captcha:token.' . $post['token']); // 校验 if (!password_verify($post['captcha'], $code)) { - throw new InvalidLoginException('验证码错误！'); + throw new InvalidLoginException('验证码错误'); } // 验证用户 $user = UserModel::usernameOrMobile($post['username'])->find(); if (!$user) { - throw new InvalidLoginException('用户不存在！'); + throw new InvalidLoginException('用户不存在'); } // 验证密码 if ($user['password'] != password_with_salt($post['password'], $user['salt'])) { - throw new InvalidLoginException('密码错误！'); + throw new InvalidLoginException('密码错误'); } // 验证用户状态 if ($user['status'] == -1) { - throw new InvalidLoginException('用户已禁用，请联系管理员！'); + throw new InvalidLoginException('用户已禁用，请联系管理员'); } } catch (InvalidLoginException $e) { $msg = $e->getMessage(); return error($msg); } catch (\Throwable $th) { $msg = $th->getMessage(); - return error('登录失败！'); + return error('登录失败'); } // 记录登录日志 @@ -79,7 +79,7 @@ class Login // 生成 jwt token $token = JWTAuth::builder(['uid' => $user['id']]); - return success('登录成功！', [ + return success('登录成功', [ 'uid' => $user['id'], 'nickname' => $user['nickname'], 'avatar' => $user['avatar'], diff --git a/app/admin/controller/v1/ProductCategory.php b/app/admin/controller/v1/ProductCategory.php index 5e1c3786..eb4f417d 100644 --- a/app/admin/controller/v1/ProductCategory.php +++ b/app/admin/controller/v1/ProductCategory.php @@ -30,10 +30,10 @@ class ProductCategory ]) ->select(); if ($ret->isEmpty()) { - return success('获取成功！'); + return success('获取成功'); } - return success('获取成功！', array_to_tree($ret->toArray(), 0, 'pid', 1)); + return success('获取成功', array_to_tree($ret->toArray(), 0, 'pid', 1)); } /** @@ -50,10 +50,10 @@ class ProductCategory ->bypk(request()->param('id')) ->find(); if (empty($category)) { - return error('分类不存在！'); + return error('分类不存在'); } - return success('获取成功！', $category); + return success('获取成功', $category); } /** @@ -96,9 +96,9 @@ class ProductCategory } if (!$category->save($data)) { - return error('操作失败！'); + return error('操作失败'); } - return success('操作成功！'); + return success('操作成功'); } /** @@ -133,7 +133,7 @@ class ProductCategory $category = ProductCategoryModel::bypk($id)->find(); if (empty($category)) { - return error('请确认操作对对象是否存在！'); + return error('请确认操作对对象是否存在'); } // 处理层级 @@ -147,7 +147,7 @@ class ProductCategory } if (!$category->save($data)) { - return error('操作失败！'); + return error('操作失败'); } // 处理子分类层级 @@ -155,7 +155,7 @@ class ProductCategory $this->handle_children($category->id, $data['level']); } - return success('操作成功！'); + return success('操作成功'); } private function handle_children($pid, $level) { @@ -181,15 +181,15 @@ class ProductCategory $category = ProductCategoryModel::bypk($id)->find(); if (empty($category)) { - return error('请确认操作对对象是否存在！'); + return error('请确认操作对对象是否存在'); } if ($sort != $category->sort) { $category->sort = $sort; if (!$category->save()) { - return error('操作失败！'); + return error('操作失败'); } } - return success('操作成功！'); + return success('操作成功'); } /** @@ -201,14 +201,14 @@ class ProductCategory $category = ProductCategoryModel::bypk($id)->find(); if (empty($category)) { - return error('请确认操作对对象是否存在！'); + return error('请确认操作对对象是否存在'); } $category->is_show = (int)!$category->is_show; if (!$category->save()) { - return error('操作失败！'); + return error('操作失败'); } - return success('操作成功！'); + return success('操作成功'); } /** @@ -219,12 +219,12 @@ class ProductCategory $id = request()->param('id'); $category = ProductCategoryModel::bypk($id)->find(); if (empty($category)) { - return error('请确认操作对对象是否存在！'); + return error('请确认操作对对象是否存在'); } if (!$category->delete()) { - return error('操作失败！'); + return error('操作失败'); } - return success('操作成功！'); + return success('操作成功'); } }