From c0a9caa6676a9c0f5c478d2df43131d863f0e4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=A1=A5=E9=87=91?= Date: Fri, 29 Dec 2023 01:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E4=BC=98=E9=9B=85=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/adminapi/logic/article/ArticleCateLogic.php | 3 +-- server/app/adminapi/logic/article/ArticleLogic.php | 3 +-- server/app/adminapi/logic/auth/AdminLogic.php | 9 +++------ .../logic/channel/OfficialAccountMenuLogic.php | 9 +++------ .../logic/channel/OfficialAccountReplyLogic.php | 6 ++---- server/app/adminapi/logic/crontab/CrontabLogic.php | 12 ++++-------- server/app/adminapi/logic/dept/DeptLogic.php | 3 +-- server/app/adminapi/logic/dept/JobsLogic.php | 3 +-- server/app/adminapi/logic/notice/NoticeLogic.php | 3 +-- server/app/adminapi/logic/recharge/RechargeLogic.php | 3 +-- server/app/api/logic/LoginLogic.php | 6 ++---- server/app/api/logic/RechargeLogic.php | 3 +-- server/app/api/logic/UserLogic.php | 12 ++++-------- server/app/api/logic/WechatLogic.php | 3 +-- server/app/common/logic/BaseLogic.php | 7 ++++--- server/app/common/logic/NoticeLogic.php | 3 +-- server/app/common/logic/PayNotifyLogic.php | 3 +-- server/app/common/logic/PaymentLogic.php | 6 ++---- .../app/common/service/generator/stub/php/logic.stub | 6 ++---- 19 files changed, 36 insertions(+), 67 deletions(-) diff --git a/server/app/adminapi/logic/article/ArticleCateLogic.php b/server/app/adminapi/logic/article/ArticleCateLogic.php index 1836fe6eb..9fcbd21ab 100644 --- a/server/app/adminapi/logic/article/ArticleCateLogic.php +++ b/server/app/adminapi/logic/article/ArticleCateLogic.php @@ -61,8 +61,7 @@ class ArticleCateLogic extends BaseLogic ]); return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/article/ArticleLogic.php b/server/app/adminapi/logic/article/ArticleLogic.php index 641ab0404..ac91c03a4 100644 --- a/server/app/adminapi/logic/article/ArticleLogic.php +++ b/server/app/adminapi/logic/article/ArticleLogic.php @@ -74,8 +74,7 @@ class ArticleLogic extends BaseLogic ]); return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/auth/AdminLogic.php b/server/app/adminapi/logic/auth/AdminLogic.php index dbaddd621..74f5fdba1 100644 --- a/server/app/adminapi/logic/auth/AdminLogic.php +++ b/server/app/adminapi/logic/auth/AdminLogic.php @@ -71,8 +71,7 @@ class AdminLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -138,8 +137,7 @@ class AdminLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -177,8 +175,7 @@ class AdminLogic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/channel/OfficialAccountMenuLogic.php b/server/app/adminapi/logic/channel/OfficialAccountMenuLogic.php index 71a67cdc9..5167f0aef 100644 --- a/server/app/adminapi/logic/channel/OfficialAccountMenuLogic.php +++ b/server/app/adminapi/logic/channel/OfficialAccountMenuLogic.php @@ -40,8 +40,7 @@ class OfficialAccountMenuLogic extends BaseLogic ConfigService::set('oa_setting', 'menu', $params); return true; } catch (\Exception $e) { - OfficialAccountMenuLogic::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -184,12 +183,10 @@ class OfficialAccountMenuLogic extends BaseLogic return true; } - self::setError('保存发布菜单失败' . json_encode($result->getContent())); - return false; + return self::setError('保存发布菜单失败' . json_encode($result->getContent())); } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/channel/OfficialAccountReplyLogic.php b/server/app/adminapi/logic/channel/OfficialAccountReplyLogic.php index bd2c5d4d9..b7cee52fd 100644 --- a/server/app/adminapi/logic/channel/OfficialAccountReplyLogic.php +++ b/server/app/adminapi/logic/channel/OfficialAccountReplyLogic.php @@ -51,8 +51,7 @@ class OfficialAccountReplyLogic extends BaseLogic OfficialAccountReply::create($params); return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -93,8 +92,7 @@ class OfficialAccountReplyLogic extends BaseLogic OfficialAccountReply::update($params); return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/crontab/CrontabLogic.php b/server/app/adminapi/logic/crontab/CrontabLogic.php index 2786ae867..af67063d3 100644 --- a/server/app/adminapi/logic/crontab/CrontabLogic.php +++ b/server/app/adminapi/logic/crontab/CrontabLogic.php @@ -43,8 +43,7 @@ class CrontabLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -84,8 +83,7 @@ class CrontabLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -104,8 +102,7 @@ class CrontabLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -136,8 +133,7 @@ class CrontabLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/dept/DeptLogic.php b/server/app/adminapi/logic/dept/DeptLogic.php index c39bd654a..10c76aa32 100644 --- a/server/app/adminapi/logic/dept/DeptLogic.php +++ b/server/app/adminapi/logic/dept/DeptLogic.php @@ -148,8 +148,7 @@ class DeptLogic extends BaseLogic ]); return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/dept/JobsLogic.php b/server/app/adminapi/logic/dept/JobsLogic.php index 925ea55a0..f921b4c7d 100644 --- a/server/app/adminapi/logic/dept/JobsLogic.php +++ b/server/app/adminapi/logic/dept/JobsLogic.php @@ -68,8 +68,7 @@ class JobsLogic extends BaseLogic ]); return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/notice/NoticeLogic.php b/server/app/adminapi/logic/notice/NoticeLogic.php index 552999e0b..22bebaea4 100644 --- a/server/app/adminapi/logic/notice/NoticeLogic.php +++ b/server/app/adminapi/logic/notice/NoticeLogic.php @@ -109,8 +109,7 @@ class NoticeLogic extends BaseLogic NoticeSetting::where('id', $params['id'])->update($updateData); return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/adminapi/logic/recharge/RechargeLogic.php b/server/app/adminapi/logic/recharge/RechargeLogic.php index d269dc9b0..8f1a1f000 100644 --- a/server/app/adminapi/logic/recharge/RechargeLogic.php +++ b/server/app/adminapi/logic/recharge/RechargeLogic.php @@ -72,8 +72,7 @@ class RechargeLogic extends BaseLogic } return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/api/logic/LoginLogic.php b/server/app/api/logic/LoginLogic.php index 1a9263bf0..dbd54d837 100644 --- a/server/app/api/logic/LoginLogic.php +++ b/server/app/api/logic/LoginLogic.php @@ -63,8 +63,7 @@ class LoginLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -111,8 +110,7 @@ class LoginLogic extends BaseLogic 'token' => $userInfo['token'], ]; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/api/logic/RechargeLogic.php b/server/app/api/logic/RechargeLogic.php index 3fe2e45e8..125806583 100644 --- a/server/app/api/logic/RechargeLogic.php +++ b/server/app/api/logic/RechargeLogic.php @@ -53,8 +53,7 @@ class RechargeLogic extends BaseLogic 'from' => 'recharge' ]; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/api/logic/UserLogic.php b/server/app/api/logic/UserLogic.php index ca040b1ec..a55e02d92 100644 --- a/server/app/api/logic/UserLogic.php +++ b/server/app/api/logic/UserLogic.php @@ -147,8 +147,7 @@ class UserLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -189,8 +188,7 @@ class UserLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -229,8 +227,7 @@ class UserLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -278,8 +275,7 @@ class UserLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/api/logic/WechatLogic.php b/server/app/api/logic/WechatLogic.php index 6cda0b533..70daa7012 100644 --- a/server/app/api/logic/WechatLogic.php +++ b/server/app/api/logic/WechatLogic.php @@ -58,8 +58,7 @@ class WechatLogic extends BaseLogic 'scanQRCode' ]); } catch (Exception $e) { - self::setError('获取jssdk失败:' . $e->getMessage()); - return false; + return self::setError('获取jssdk失败:' . $e->getMessage()); } } } \ No newline at end of file diff --git a/server/app/common/logic/BaseLogic.php b/server/app/common/logic/BaseLogic.php index 0be59edaa..882e10019 100644 --- a/server/app/common/logic/BaseLogic.php +++ b/server/app/common/logic/BaseLogic.php @@ -56,12 +56,13 @@ class BaseLogic /** * @notes 设置错误信息 * @param $error - * @author 段誉 - * @date 2021/7/21 18:20 + * @author 段誉,muxi_k + * @date 2023/12/31 18:20 */ - public static function setError($error) : void + public static function setError($error) : bool { !empty($error) && self::$error = $error; + return false; } diff --git a/server/app/common/logic/NoticeLogic.php b/server/app/common/logic/NoticeLogic.php index 913aa0914..1e33823f7 100644 --- a/server/app/common/logic/NoticeLogic.php +++ b/server/app/common/logic/NoticeLogic.php @@ -56,8 +56,7 @@ class NoticeLogic extends BaseLogic return $res; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/common/logic/PayNotifyLogic.php b/server/app/common/logic/PayNotifyLogic.php index 262fc513a..c24c07206 100644 --- a/server/app/common/logic/PayNotifyLogic.php +++ b/server/app/common/logic/PayNotifyLogic.php @@ -45,8 +45,7 @@ class PayNotifyLogic extends BaseLogic $e->getLine(), $e->getMessage() ])); - self::setError($e->getMessage()); - return $e->getMessage(); + return self::setError($e->getMessage()); } } diff --git a/server/app/common/logic/PaymentLogic.php b/server/app/common/logic/PaymentLogic.php index ed7357295..a33f6f109 100644 --- a/server/app/common/logic/PaymentLogic.php +++ b/server/app/common/logic/PaymentLogic.php @@ -84,8 +84,7 @@ class PaymentLogic extends BaseLogic ]; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -128,8 +127,7 @@ class PaymentLogic extends BaseLogic 'order' => $orderInfo ]; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } diff --git a/server/app/common/service/generator/stub/php/logic.stub b/server/app/common/service/generator/stub/php/logic.stub index 4d4b7a6a3..20c16b318 100644 --- a/server/app/common/service/generator/stub/php/logic.stub +++ b/server/app/common/service/generator/stub/php/logic.stub @@ -48,8 +48,7 @@ class {UPPER_CAMEL_NAME}Logic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -73,8 +72,7 @@ class {UPPER_CAMEL_NAME}Logic extends BaseLogic return true; } catch (\Exception $e) { Db::rollback(); - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } -- Gitee