From 79edaa03f15fb5a12531e5202fef31bbf63ff4f8 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 27 Aug 2024 20:50:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E4=BD=BF=E7=94=A8BusinessException?= =?UTF-8?q?=E6=9B=BF=E4=BB=A3setError=E5=92=8Crollback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/logic/auth/RoleLogic.php | 7 +++---- app/admin/logic/tools/GeneratorLogic.php | 19 +++++++------------ app/store/logic/auth/RoleLogic.php | 7 +++---- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/app/admin/logic/auth/RoleLogic.php b/app/admin/logic/auth/RoleLogic.php index 8146899f0..099ebeedc 100644 --- a/app/admin/logic/auth/RoleLogic.php +++ b/app/admin/logic/auth/RoleLogic.php @@ -20,6 +20,7 @@ use app\common\{ logic\BaseLogic, model\auth\SystemRoleMenu }; +use support\exception\BusinessException; use think\facade\Db; @@ -66,8 +67,7 @@ class RoleLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } @@ -110,8 +110,7 @@ class RoleLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } diff --git a/app/admin/logic/tools/GeneratorLogic.php b/app/admin/logic/tools/GeneratorLogic.php index d88a288fe..dcef7c75f 100644 --- a/app/admin/logic/tools/GeneratorLogic.php +++ b/app/admin/logic/tools/GeneratorLogic.php @@ -21,6 +21,7 @@ use app\common\model\tools\GenerateTable; use app\common\service\generator\GenerateService; use support\Cache; use support\Container; +use support\exception\BusinessException; use think\facade\Db; @@ -78,8 +79,7 @@ class GeneratorLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } @@ -134,8 +134,7 @@ class GeneratorLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } @@ -157,8 +156,7 @@ class GeneratorLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } @@ -187,8 +185,7 @@ class GeneratorLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } @@ -228,8 +225,7 @@ class GeneratorLogic extends BaseLogic return ['file' => $zipFile]; } catch (\Exception $e) { - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } @@ -252,8 +248,7 @@ class GeneratorLogic extends BaseLogic return Container::get(GenerateService::class)->preview($table); } catch (\Exception $e) { - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } diff --git a/app/store/logic/auth/RoleLogic.php b/app/store/logic/auth/RoleLogic.php index e0113d50b..adb39bee9 100644 --- a/app/store/logic/auth/RoleLogic.php +++ b/app/store/logic/auth/RoleLogic.php @@ -20,6 +20,7 @@ use app\common\{ logic\BaseLogic, model\auth\SystemRoleMenu }; +use support\exception\BusinessException; use think\facade\Db; @@ -66,8 +67,7 @@ class RoleLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } } @@ -110,8 +110,7 @@ class RoleLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::$error = $e->getMessage(); - return false; + throw new BusinessException($e->getMessage()); } }