diff --git a/server/app/adminapi/logic/article/ArticleCateLogic.php b/server/app/adminapi/logic/article/ArticleCateLogic.php index 1836fe6ebd18984dd72a8081f8d9b4db11afc8f7..9fcbd21abecc7f14e6a8edb611c0c5e58be044d9 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 641ab040466ea49353634dbe06be94c354d72d65..ac91c03a41b8ad9bc1773138a078d49ce1e147fb 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 dbaddd621f4c17371a15f17011eafca4b1e83a50..74f5fdba10fef0509537f41907124c5311364e8b 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 454526f5dd625a1176941ddbe82ff107f42d625a..1ca2f104d81bbaa845cdee5545e33c532fdd5b49 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()); } } @@ -197,8 +196,7 @@ class OfficialAccountMenuLogic extends BaseLogic return false; } 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 bd2c5d4d9899792d25b196420521b42f6397189b..b7cee52fd93c2f3c47807d082b4109b0d588a06f 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 2786ae867032fe10671b71ecf846c196086995ec..af67063d38de3f86410776bea2787cca1ca2a30c 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 c39bd654aa811353537db08a26f054754d67ac52..10c76aa321b423ca5933923e04480a955a65ebac 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 925ea55a01564acf75b8abf6fc12bf4b342b05c2..f921b4c7d65c259f297c0f8eb28785092437dee4 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 552999e0bdec9cd24f06c1d8896f0bc78f86e2fe..22bebaea42e94c0004987f090f43782831952daa 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 6ffa175198bfefc45023389a78597cdbe6b8d52d..b85022458c54924e1c50112e6e6818d8396bcbde 100644 --- a/server/app/adminapi/logic/recharge/RechargeLogic.php +++ b/server/app/adminapi/logic/recharge/RechargeLogic.php @@ -71,8 +71,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 1a9263bf019785ca22d8dcc56f1ce825839f0099..dbd54d837772da3e857dc03d543c33936cfc8cc1 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 3fe2e45e879d2588aeb98637d9dae56a4c150bb0..125806583dff4043f81cfa7f680c32e54fd56389 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 f48efe31417c392fff84b8fc436b4ab313dd5fb9..8e225d526ac8b39e431736ee53248ae8becf26e8 100644 --- a/server/app/api/logic/UserLogic.php +++ b/server/app/api/logic/UserLogic.php @@ -152,8 +152,7 @@ class UserLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -194,8 +193,7 @@ class UserLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -234,8 +232,7 @@ class UserLogic extends BaseLogic return true; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -283,8 +280,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 6cda0b5331ee2c9cda437354f4d66549a4190efe..70daa701215dbe94cccc6585d3580a33d63787dc 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 0be59edaafe84e8acb29d5ec56c11bceb3c7d4b6..882e1001936203eec5a3c5670b9dd11f5f31f94e 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 913aa091437151830b670da907b90f8165ae6665..1e33823f70faa807a825f6fab2e5c7426967ad68 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 b3339b5d56e7dfe4f3f7e7dabed699dccb8ec076..1dacbc4d61280acdc7fa4ccac4054dfe046b892b 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 247d6a776aec86d2215013356bf2ad892f6bdc71..f03dd322a244f75318f881a23ab891c108cf4f8b 100644 --- a/server/app/common/logic/PaymentLogic.php +++ b/server/app/common/logic/PaymentLogic.php @@ -85,8 +85,7 @@ class PaymentLogic extends BaseLogic ]; } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; + return self::setError($e->getMessage()); } } @@ -129,8 +128,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 4d4b7a6a3aad863ed3efd0c73cc633dbf077addb..20c16b318fdbae90bf18edff4898ac4d6b754094 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()); } }