更优雅的返回错误

server/app/adminapi/logic/article/ArticleCateLogic.php

@@ -61,8 +61,7 @@ public static function edit(array $params) : bool
             ]);
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/article/ArticleLogic.php

@@ -74,8 +74,7 @@ public static function edit(array $params) : bool
             ]);
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/auth/AdminLogic.php

@@ -71,8 +71,7 @@ public static function add(array $params)
             return true;
         } catch (\Exception $e) {
             Db::rollback();
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -138,8 +137,7 @@ public static function edit(array $params): bool
             return true;
         } catch (\Exception $e) {
             Db::rollback();
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -177,8 +175,7 @@ public static function delete(array $params): bool
             return true;
         } catch (\Exception $e) {
             Db::rollback();
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/channel/OfficialAccountMenuLogic.php

@@ -40,8 +40,7 @@ public static function save($params)
             ConfigService::set('oa_setting', 'menu', $params);
             return true;
         } catch (\Exception $e) {
-            OfficialAccountMenuLogic::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -192,13 +191,11 @@ public static function saveAndPublish($params)
                 return true;
             }
 
-            self::setError('保存发布菜单失败' . json_encode($result->getContent()));
+            return self::setError('保存发布菜单失败' . json_encode($result));
 
-            return false;
 
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/channel/OfficialAccountReplyLogic.php

@@ -51,8 +51,7 @@ public static function add($params)
             OfficialAccountReply::create($params);
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -93,8 +92,7 @@ public static function edit($params)
             OfficialAccountReply::update($params);
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/crontab/CrontabLogic.php

@@ -43,8 +43,7 @@ public static function add($params)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -84,8 +83,7 @@ public static function edit($params)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -104,8 +102,7 @@ public static function delete($params)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -136,8 +133,7 @@ public static function operate($params)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/dept/DeptLogic.php

@@ -148,8 +148,7 @@ public static function edit(array $params): bool
             ]);
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/dept/JobsLogic.php

@@ -68,8 +68,7 @@ public static function edit(array $params) : bool
             ]);
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/notice/NoticeLogic.php

@@ -109,8 +109,7 @@ public static function set($params)
             NoticeSetting::where('id', $params['id'])->update($updateData);
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/adminapi/logic/recharge/RechargeLogic.php

@@ -71,8 +71,7 @@ public static function setConfig($params)
             }
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/api/logic/LoginLogic.php

@@ -63,8 +63,7 @@ public static function register(array $params)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -111,8 +110,7 @@ public static function login($params)
                 'token' => $userInfo['token'],
             ];
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/api/logic/RechargeLogic.php

@@ -53,8 +53,7 @@ public static function recharge(array $params)
                 'from' => 'recharge'
             ];
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/api/logic/UserLogic.php

@@ -152,8 +152,7 @@ public static function resetPassword(array $params)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -194,8 +193,7 @@ public static function changePassword(array $params, int $userId)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -234,8 +232,7 @@ public static function getMobileByMnp(array $params)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -283,8 +280,7 @@ public static function bindMobile(array $params)
 
             return true;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/api/logic/WechatLogic.php

@@ -58,8 +58,7 @@ public static function jsConfig($params)
                 'scanQRCode'
             ]);
         } catch (Exception $e) {
-            self::setError('获取jssdk失败:' . $e->getMessage());
-            return false;
+            return self::setError('获取jssdk失败:' . $e->getMessage());
         }
     }
 }

server/app/common/logic/BaseLogic.php

@@ -56,12 +56,13 @@ public static function getError() : string
     /**
      * @notes 设置错误信息
      * @param $error
-     * @author 段誉
-     * @date 2021/7/21 18:20
+     * @author 段誉,muxi_k
+     * @date 2023/12/29 18:20
      */
-    public static function setError($error) : void
+    public static function setError($error) : bool
     {
         !empty($error) && self::$error = $error;
+        return false;
     }
 
 

server/app/common/logic/NoticeLogic.php

@@ -56,8 +56,7 @@ public static function noticeByScene($params)
 
             return $res;
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

server/app/common/logic/PayNotifyLogic.php

@@ -45,8 +45,7 @@ public static function handle($action, $orderSn, $extra = [])
                 $e->getLine(),
                 $e->getMessage()
             ]));
-            self::setError($e->getMessage());
-            return $e->getMessage();
+            return self::setError($e->getMessage());
         }
     }
 

server/app/common/logic/PaymentLogic.php

@@ -85,8 +85,7 @@ public static function getPayWay($userId, $terminal, $params)
             ];
 
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 
@@ -129,8 +128,7 @@ public static function getPayStatus($params)
                 'order' => $orderInfo
             ];
         } catch (\Exception $e) {
-            self::setError($e->getMessage());
-            return false;
+            return self::setError($e->getMessage());
         }
     }
 

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());
         }
     }