diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 9f0d3491a3e45c897a621f3e5ed533edbbb78116..d48b3ad2bd5915df6bdc095a39fcf959037cd4c6 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -59,13 +59,18 @@ class Handler extends ExceptionHandler */ public function render($request, Throwable $exception) { - if ($request->isJson()){ + if ($request->isJson() || $request->is('api/*')){ // 路由404异常监听 if($exception instanceof NotFoundHttpException){ $this->setHttpCode(404); return $this->errorJson("路由{{$request->path()}}不存在!"); } + // 控制器不存在 + if ($exception instanceof BindingResolutionException){ + return $this->setJsonReturn($exception); + } + // 模型不存在 if ($exception instanceof ModelNotFoundException){ return $this->setJsonReturn($exception); @@ -76,7 +81,7 @@ class Handler extends ExceptionHandler return $this->errorJson($exception->validator->errors()->first()); } - // Exception类的错误监听 + // 自定义Exception类的错误监听 if($exception instanceof Exception){ return $this->setJsonReturn($exception); } @@ -93,9 +98,18 @@ class Handler extends ExceptionHandler private function setJsonReturn($exception) { $APP_DEBUG = env('APP_DEBUG'); - return $this->errorJson($exception->getMessage(), $exception->getCode(), [], $APP_DEBUG ? [ + + // 设置HTTP的状态码 + $http_status = isset($http_status) ? $http_status : (method_exists($exception, 'getStatusCode') ? $exception->getStatusCode() : 200); + + // 可设置`status`,但是也要限制 + $status = $exception->getCode() != 1 ? 0 : 1; + + return $this->errorJson($exception->getMessage(), $status, [], $APP_DEBUG ? [ 'file' => $exception->getFile(), 'line' => $exception->getLine(), + 'code' => $exception->getCode(), + 'http_status' => (int)$http_status ] : []); } } diff --git a/app/Modules/Admin/Console/stubs/controller.plain.stub b/app/Modules/Admin/Console/stubs/controller.plain.stub index 749968652038431d1f1dc05ef1df5209ec7a14c2..22a8b5e197604705116191e7c58485a95d8c8a9f 100644 --- a/app/Modules/Admin/Console/stubs/controller.plain.stub +++ b/app/Modules/Admin/Console/stubs/controller.plain.stub @@ -4,6 +4,7 @@ namespace {{ namespace }}; use {{ request_namespace }} as {{ request }}; use {{ service_namespace }} as {{ service }}; +use Illuminate\Http\JsonResponse; class {{ class }} extends BaseController { @@ -12,12 +13,12 @@ class {{ class }} extends BaseController $this->service = $service; } - public function create({{ request }} $request) + public function create({{ request }} $request): JsonResponse { return $this->createService($request); } - public function update({{ request }} $request) + public function update({{ request }} $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php b/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php index 923d061e6f957e47f618e8955065b8cc54e77f2d..bb404103b14c284395ec45de9e0c899ebca68732 100644 --- a/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php +++ b/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\Article; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\Article\ArticleCategoryRequest; use App\Modules\Admin\Services\ArticleCategoryService; +use Illuminate\Http\JsonResponse; class ArticleCategoryController extends BaseController { @@ -13,12 +14,12 @@ class ArticleCategoryController extends BaseController $this->service = $articleCategoryService; } - public function create(ArticleCategoryRequest $request) + public function create(ArticleCategoryRequest $request): JsonResponse { return $this->createService($request); } - public function update(ArticleCategoryRequest $request) + public function update(ArticleCategoryRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/Article/ArticleController.php b/app/Modules/Admin/Http/Controllers/Article/ArticleController.php index cb9385c962eb5bd113d17bf14ce4a834c4cee37b..7050f307f90e5dfd4e375e7bcca226ac55aadea7 100644 --- a/app/Modules/Admin/Http/Controllers/Article/ArticleController.php +++ b/app/Modules/Admin/Http/Controllers/Article/ArticleController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\Article; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\Article\ArticleRequest; use App\Modules\Admin\Services\ArticleService; +use Illuminate\Http\JsonResponse; class ArticleController extends BaseController { @@ -13,12 +14,12 @@ class ArticleController extends BaseController $this->service = $articleService; } - public function create(ArticleRequest $request) + public function create(ArticleRequest $request): JsonResponse { return $this->createService($request); } - public function update(ArticleRequest $request) + public function update(ArticleRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/Article/ArticleLabelController.php b/app/Modules/Admin/Http/Controllers/Article/ArticleLabelController.php index 7aaf19da1c109545dd37e2061f1e22365281e806..f030adc4639e57b23c213d7c68f794a743bc682a 100644 --- a/app/Modules/Admin/Http/Controllers/Article/ArticleLabelController.php +++ b/app/Modules/Admin/Http/Controllers/Article/ArticleLabelController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\Article; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\Article\ArticleLabelRequest; use App\Modules\Admin\Services\ArticleLabelService; +use Illuminate\Http\JsonResponse; class ArticleLabelController extends BaseController { @@ -13,12 +14,12 @@ class ArticleLabelController extends BaseController $this->service = $articleLabelService; } - public function create(ArticleLabelRequest $request) + public function create(ArticleLabelRequest $request): JsonResponse { return $this->createService($request); } - public function update(ArticleLabelRequest $request) + public function update(ArticleLabelRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/AuthController.php b/app/Modules/Admin/Http/Controllers/AuthController.php index e263672f8520b9bf51932bd17a36e7dc8199a0c1..8c8cd703bd7f251107f759f9c367346b93923e1d 100644 --- a/app/Modules/Admin/Http/Controllers/AuthController.php +++ b/app/Modules/Admin/Http/Controllers/AuthController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers; use App\Modules\Admin\Entities\Rabc\AdminMenu; use App\Modules\Admin\Http\Requests\LoginRequest; use App\Modules\Admin\Services\AuthService; +use Illuminate\Http\JsonResponse; class AuthController extends BaseController { @@ -21,7 +22,7 @@ class AuthController extends BaseController * @throws \App\Exceptions\Admin\AuthException * @throws \App\Exceptions\InvalidRequestException */ - public function login(LoginRequest $request) + public function login(LoginRequest $request): JsonResponse { $data = $request->validated(); @@ -37,7 +38,7 @@ class AuthController extends BaseController * @return \Illuminate\Http\JsonResponse * @throws \App\Exceptions\Admin\AuthException */ - public function me() + public function me(): JsonResponse { if (\request()->getMethod() == 'OPTIONS'){ return $this->successJson(); @@ -51,15 +52,15 @@ class AuthController extends BaseController * * @return \Illuminate\Http\JsonResponse */ - public function logout() + public function logout(): JsonResponse { return $this->successJson($this->service->logout()); } - public function getRabcList() + public function getRabcList(): JsonResponse { return $this->successJson($this->service->getRabcList()); - + // 临时测试数据 return $this->successJson(list_to_tree(AdminMenu::getInstance()->getAllMenus()->toArray())); } diff --git a/app/Modules/Admin/Http/Controllers/BaseController.php b/app/Modules/Admin/Http/Controllers/BaseController.php index 6006d7ceed566951c17129216cf020d4c7493251..f29ba9832b336141b864270fa61475cc772164db 100644 --- a/app/Modules/Admin/Http/Controllers/BaseController.php +++ b/app/Modules/Admin/Http/Controllers/BaseController.php @@ -4,6 +4,7 @@ namespace App\Modules\Admin\Http\Controllers; use App\Traits\Json; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Routing\Controller; @@ -20,7 +21,7 @@ class BaseController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function index(Request $request) + public function index(Request $request): JsonResponse { if (!isset($this->service)){ return $this->successJson([], '请先设置Service或者重写方法!'); @@ -35,16 +36,14 @@ class BaseController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function detail(Request $request) + public function detail(Request $request): JsonResponse { if (!isset($this->service)){ return $this->successJson([], '请先设置Service或者重写方法!'); } - if ($detail = $this->service->detail($request)){ - return $this->successJson($detail); - }else{ - return $this->errorJson('数据不存在!'); - } + $detail = $this->service->detail($request); + + return $this->successJson($detail); } /** @@ -54,7 +53,7 @@ class BaseController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function createService($request) + public function createService($request): JsonResponse { if ($request instanceof FormRequest){ $request->validated(); @@ -63,11 +62,9 @@ class BaseController extends Controller if (!isset($this->service)){ return $this->successJson([], '请先设置Service或者重写方法!'); } - if ($this->service->create($request->all())){ - return $this->successJson([], $this->service->getError()); - }else{ - return $this->errorJson($this->service->getError()); - } + $this->service->create($request->all()); + + return $this->successJson([], $this->service->getError()); } /** @@ -77,7 +74,7 @@ class BaseController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function updateService($request) + public function updateService($request): JsonResponse { if ($request instanceof FormRequest){ $request->validated(); @@ -86,11 +83,9 @@ class BaseController extends Controller if (!isset($this->service)){ return $this->successJson([], '请先设置Service或者重写方法!'); } - if ($this->service->update($request->all())){ - return $this->successJson([], $this->service->getError()); - }else{ - return $this->errorJson($this->service->getError()); - } + $this->service->update($request->all()); + + return $this->successJson([], $this->service->getError()); } /** @@ -100,16 +95,14 @@ class BaseController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function delete(Request $request) + public function delete(Request $request): JsonResponse { if (!isset($this->service)){ return $this->successJson([], '请先设置Service或者重写方法!'); } - if ($this->service->delete($request->all())){ - return $this->successJson([], $this->service->getError()); - }else{ - return $this->errorJson($this->service->getError()); - } + $this->service->delete($request->all()); + + return $this->successJson([], $this->service->getError()); } /** @@ -119,17 +112,15 @@ class BaseController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function changeFiledStatus(Request $request) + public function changeFiledStatus(Request $request): JsonResponse { if (!isset($this->service)){ return $this->successJson([], '请先设置Service或者重写方法!'); } - if ($this->service->changeFiledStatus($request->all())){ - return $this->successJson([], $this->service->getError()); - }else{ - return $this->errorJson($this->service->getError()); - } + $this->service->changeFiledStatus($request->all()); + + return $this->successJson([], $this->service->getError()); } /** @@ -139,7 +130,7 @@ class BaseController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function getSelectLists(Request $request) + public function getSelectLists(Request $request): JsonResponse { $lists = $this->service->getSelectLists($request); return $this->successJson($lists); diff --git a/app/Modules/Admin/Http/Controllers/DatabaseController.php b/app/Modules/Admin/Http/Controllers/DatabaseController.php index dcfd1276c1feddd659e87a9d9b3e71b56b366999..5e005545e6ebce663c3c50575bdf4ba6f7fabcba 100644 --- a/app/Modules/Admin/Http/Controllers/DatabaseController.php +++ b/app/Modules/Admin/Http/Controllers/DatabaseController.php @@ -35,11 +35,8 @@ class DatabaseController extends BaseController public function backupsTables(Request $request): JsonResponse { set_time_limit(0);//防止超时 - if ($result = $this->service->backupsTables($request->tables_list)){ - return $this->successJson($result, $this->service->getError()); - }else{ - return $this->errorJson($this->service->getError()); - } + $result = $this->service->backupsTables($request->tables_list); + return $this->successJson($result, $this->service->getError()); } /** @@ -61,10 +58,8 @@ class DatabaseController extends BaseController */ public function deleteBackup(Request $request): JsonResponse { - if ($this->service->deleteBackup($request->input('backup_id'))){ - return $this->successJson([], $this->service->getError()); - }else{ - return $this->errorJson($this->service->getError()); - } + $this->service->deleteBackup($request->input('backup_id')); + + return $this->successJson([], $this->service->getError()); } } diff --git a/app/Modules/Admin/Http/Controllers/FileController.php b/app/Modules/Admin/Http/Controllers/FileController.php index 740952397c10362076e80bb86d85c6886b312d61..6da943ce47f4c37548afc09bf972e37e26278a13 100644 --- a/app/Modules/Admin/Http/Controllers/FileController.php +++ b/app/Modules/Admin/Http/Controllers/FileController.php @@ -3,6 +3,7 @@ namespace App\Modules\Admin\Http\Controllers; use App\Modules\Admin\Services\FileService; +use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; class FileController extends BaseController @@ -19,12 +20,10 @@ class FileController extends BaseController * * @return \Illuminate\Http\JsonResponse */ - public function removeFileGroup(Request $request) + public function removeFileGroup(Request $request): JsonResponse { - if ($this->service->removeFileGroup($request->all())){ - return $this->successJson([], $this->service->getError()); - }else{ - return $this->errorJson($this->service->getError()); - } + $this->service->removeFileGroup($request->all()); + + return $this->successJson([], $this->service->getError()); } } diff --git a/app/Modules/Admin/Http/Controllers/FileGroupController.php b/app/Modules/Admin/Http/Controllers/FileGroupController.php index d6267e6fb1bbd6fc56d40af8596d601e74df8fbe..9784964aac5db31f8912b54e8b11914a8b5c1abe 100644 --- a/app/Modules/Admin/Http/Controllers/FileGroupController.php +++ b/app/Modules/Admin/Http/Controllers/FileGroupController.php @@ -4,6 +4,7 @@ namespace App\Modules\Admin\Http\Controllers; use App\Modules\Admin\Http\Requests\FileGroupRequest; use App\Modules\Admin\Services\FileGroupService; +use Illuminate\Http\JsonResponse; class FileGroupController extends BaseController { @@ -12,12 +13,13 @@ class FileGroupController extends BaseController $this->service = $fileGroupService; } - public function create(FileGroupRequest $request) + public function create(FileGroupRequest $request): JsonResponse + { return $this->createService($request); } - public function update(FileGroupRequest $request) + public function update(FileGroupRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/IndexController.php b/app/Modules/Admin/Http/Controllers/IndexController.php index a46eab31581f48930c6befe06e2969cae8638571..d1da68b2c94fc19b94448cf31df99b07747c078d 100644 --- a/app/Modules/Admin/Http/Controllers/IndexController.php +++ b/app/Modules/Admin/Http/Controllers/IndexController.php @@ -4,6 +4,7 @@ namespace App\Modules\Admin\Http\Controllers; use App\Models\MonthModel; use App\Modules\Admin\Services\IndexService; +use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; class IndexController extends BaseController @@ -13,7 +14,7 @@ class IndexController extends BaseController $this->service = $indexService; } - public function index(Request $request) + public function index(Request $request): JsonResponse { return $this->successJson($this->service->index()); } @@ -25,7 +26,7 @@ class IndexController extends BaseController * * @return \Illuminate\Http\JsonResponse */ - public function logsStatistics(Request $request) + public function logsStatistics(Request $request): JsonResponse { return $this->successJson($this->service->logsStatistics()); } @@ -35,7 +36,7 @@ class IndexController extends BaseController * * @return \Illuminate\Http\JsonResponse */ - public function getMonthList() + public function getMonthList(): JsonResponse { return $this->successJson(MonthModel::getInstance()->getAllMonthes()); } @@ -47,13 +48,11 @@ class IndexController extends BaseController * * @return \Illuminate\Http\JsonResponse */ - public function update(Request $request) + public function update(Request $request): JsonResponse { - if ( $this->service->updateAdmin($request) ) { - return $this->successJson([], $this->service->getError()); - } else { - return $this->errorJson($this->service->getError()); - } + $this->service->updateAdmin($request); + + return $this->successJson([], $this->service->getError()); } /** @@ -61,7 +60,7 @@ class IndexController extends BaseController * * @return mixed */ - public function versionLogs() + public function versionLogs(): JsonResponse { return $this->successJson($this->service->versionLogs()); } @@ -71,7 +70,7 @@ class IndexController extends BaseController * * @return \Illuminate\Http\JsonResponse */ - public function getServerStatus() + public function getServerStatus(): JsonResponse { return $this->successJson($this->service->getServerStatus()); } diff --git a/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php b/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php index a4a03fd6956390365e7f5db487c11657250a3d98..f1e1fc85f2608264d6048152d1bb26c8aeed9fca 100644 --- a/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php +++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\Rabc; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\Rabc\AdminRequest; use App\Modules\Admin\Services\AdminService; +use Illuminate\Http\JsonResponse; class AdminController extends BaseController { @@ -13,12 +14,12 @@ class AdminController extends BaseController $this->service = $adminService; } - public function create(AdminRequest $request) + public function create(AdminRequest $request): JsonResponse { return $this->createService($request); } - public function update(AdminRequest $request) + public function update(AdminRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php b/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php index 40d95e9aab972383567b2f44b2320092746ee87e..b24f0d1848a0915d42287f668078108e68034608 100644 --- a/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php +++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\Rabc; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\Rabc\AdminMenuRequest; use App\Modules\Admin\Services\AdminMenuService; +use Illuminate\Http\JsonResponse; class AdminMenuController extends BaseController { @@ -13,12 +14,12 @@ class AdminMenuController extends BaseController $this->service = $adminMenuService; } - public function create(AdminMenuRequest $request) + public function create(AdminMenuRequest $request): JsonResponse { return $this->createService($request); } - public function update(AdminMenuRequest $request) + public function update(AdminMenuRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php b/app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php index 5ff9f1eb1cf0e7e61ca7b3de70ab1fffd4f7f195..622c1b4461c16f1a63c9e02295a575c9548070b8 100644 --- a/app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php +++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\Rabc; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\Rabc\AdminRoleRequest; use App\Modules\Admin\Services\AdminRoleService; +use Illuminate\Http\JsonResponse; class AdminRoleController extends BaseController { @@ -13,12 +14,12 @@ class AdminRoleController extends BaseController $this->service = $adminRoleService; } - public function create(AdminRoleRequest $request) + public function create(AdminRoleRequest $request): JsonResponse { return $this->createService($request); } - public function update(AdminRoleRequest $request) + public function update(AdminRoleRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/System/BannerController.php b/app/Modules/Admin/Http/Controllers/System/BannerController.php index 11598c26f11286fec96550bee6994091901746f9..0019a3252f90c8eaaad7db0315e130ee190e7959 100644 --- a/app/Modules/Admin/Http/Controllers/System/BannerController.php +++ b/app/Modules/Admin/Http/Controllers/System/BannerController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\System; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\System\BannerRequest; use App\Modules\Admin\Services\BannerService; +use Illuminate\Http\JsonResponse; class BannerController extends BaseController { @@ -13,12 +14,12 @@ class BannerController extends BaseController $this->service = $bannerService; } - public function create(BannerRequest $request) + public function create(BannerRequest $request): JsonResponse { return $this->createService($request); } - public function update(BannerRequest $request) + public function update(BannerRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/System/ConfigController.php b/app/Modules/Admin/Http/Controllers/System/ConfigController.php index 3ab6f3097d634a227194b8f3f49cb08b276030df..e2a076f65f01ef5de3ea690b1763f6acc3d3f69b 100644 --- a/app/Modules/Admin/Http/Controllers/System/ConfigController.php +++ b/app/Modules/Admin/Http/Controllers/System/ConfigController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\System; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\System\ConfigRequest; use App\Modules\Admin\Services\ConfigService; +use Illuminate\Http\JsonResponse; class ConfigController extends BaseController { @@ -13,17 +14,17 @@ class ConfigController extends BaseController $this->service = $configService; } - public function create(ConfigRequest $request) + public function create(ConfigRequest $request): JsonResponse { return $this->createService($request); } - public function update(ConfigRequest $request) + public function update(ConfigRequest $request): JsonResponse { return $this->updateService($request); } - public function getConfigGroupType() + public function getConfigGroupType(): JsonResponse { $config_type_list = $config_group_list = []; $config_group = cnpscy_config('config_group_list'); @@ -51,7 +52,7 @@ class ConfigController extends BaseController * * @return \Illuminate\Http\JsonResponse */ - public function pushRefreshConfig() + public function pushRefreshConfig(): JsonResponse { $this->service->pushRefreshConfig(); return $this->successJson([], '配置文件已同步成功!'); diff --git a/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php b/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php index 3cecbac7d3c3c04237fcbd46a67a004f1f52fe7c..2fa28dda36ef13bad2bb36d11112a32727a9f9d8 100644 --- a/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php +++ b/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\System; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\System\FriendlinkRequest; use App\Modules\Admin\Services\FriendlinkService; +use Illuminate\Http\JsonResponse; class FriendlinkController extends BaseController { @@ -13,12 +14,12 @@ class FriendlinkController extends BaseController $this->service = $friendlinkService; } - public function create(FriendlinkRequest $request) + public function create(FriendlinkRequest $request): JsonResponse { return $this->createService($request); } - public function update(FriendlinkRequest $request) + public function update(FriendlinkRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/System/ProtocolController.php b/app/Modules/Admin/Http/Controllers/System/ProtocolController.php index 86ab72687fbe6d13029afc39f9dbb93fbd922ddd..a83681cc1c6ab214b8fabb672cb71d4d3df165cb 100644 --- a/app/Modules/Admin/Http/Controllers/System/ProtocolController.php +++ b/app/Modules/Admin/Http/Controllers/System/ProtocolController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\System; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\System\ProtocolRequest; use App\Modules\Admin\Services\ProtocolService; +use Illuminate\Http\JsonResponse; class ProtocolController extends BaseController { @@ -13,12 +14,12 @@ class ProtocolController extends BaseController $this->service = $protocolService; } - public function create(ProtocolRequest $request) + public function create(ProtocolRequest $request): JsonResponse { return $this->createService($request); } - public function update(ProtocolRequest $request) + public function update(ProtocolRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/System/VersionController.php b/app/Modules/Admin/Http/Controllers/System/VersionController.php index 768cfdb4db17d88e7c6d8fc60a3a55863a89716c..f2b38a7fd42f5da94f3cc83c58f6f4c57966eaa8 100644 --- a/app/Modules/Admin/Http/Controllers/System/VersionController.php +++ b/app/Modules/Admin/Http/Controllers/System/VersionController.php @@ -5,6 +5,7 @@ namespace App\Modules\Admin\Http\Controllers\System; use App\Modules\Admin\Http\Controllers\BaseController; use App\Modules\Admin\Http\Requests\System\VersionRequest; use App\Modules\Admin\Services\VersionService; +use Illuminate\Http\JsonResponse; class VersionController extends BaseController { @@ -13,12 +14,12 @@ class VersionController extends BaseController $this->service = $versionService; } - public function create(VersionRequest $request) + public function create(VersionRequest $request): JsonResponse { return $this->createService($request); } - public function update(VersionRequest $request) + public function update(VersionRequest $request): JsonResponse { return $this->updateService($request); } diff --git a/app/Modules/Admin/Http/Controllers/UploadController.php b/app/Modules/Admin/Http/Controllers/UploadController.php index a04bf27af7940e9faeb4d2dd389a422f22c249f5..017bd2736f1a6943111b7aa582564e920d8c61c7 100644 --- a/app/Modules/Admin/Http/Controllers/UploadController.php +++ b/app/Modules/Admin/Http/Controllers/UploadController.php @@ -3,6 +3,7 @@ namespace App\Modules\Admin\Http\Controllers; use App\Models\UploadFile; +use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; class UploadController extends BaseController @@ -16,7 +17,7 @@ class UploadController extends BaseController * * @return \Illuminate\Http\JsonResponse */ - public function file(Request $request, $file = 'file') + public function file(Request $request, $file = 'file'): JsonResponse { if (empty($request->file($file))){ return $this->errorJson('请上传文件!'); diff --git a/app/Modules/Admin/Services/AdminRoleService.php b/app/Modules/Admin/Services/AdminRoleService.php index 3c0285751607883780c610b7f918770ee247e899..3a251f1d67bd578468d4dd97a48b6c9d737ffc1d 100644 --- a/app/Modules/Admin/Services/AdminRoleService.php +++ b/app/Modules/Admin/Services/AdminRoleService.php @@ -55,8 +55,7 @@ class AdminRoleService extends BaseService return true; }catch (Exception $e){ DB::rollBack(); - $this->setError($e->getMessage()); - return false; + throw new Exception($e->getMessage()); } } @@ -72,8 +71,7 @@ class AdminRoleService extends BaseService return true; }catch (Exception $e){ DB::rollBack(); - $this->setError($e->getMessage()); - return false; + throw new Exception($e->getMessage()); } } @@ -117,8 +115,7 @@ class AdminRoleService extends BaseService { $primaryKey = $this->model->getKeyName(); if (isset($params[$primaryKey]) && $params[$primaryKey] == 1){ - $this->setError('超管角色禁止删除!'); - return false; + throw new Exception('超管角色禁止删除!'); } // 如果是批量删除,那么移除Id diff --git a/app/Modules/Admin/Services/AdminService.php b/app/Modules/Admin/Services/AdminService.php index 835d0545e58514695285d80f9932486c7cab0b85..9504b931fbc6a1368187424026a867b92b498c91 100644 --- a/app/Modules/Admin/Services/AdminService.php +++ b/app/Modules/Admin/Services/AdminService.php @@ -66,8 +66,7 @@ class AdminService extends BaseService return true; }catch (Exception $e){ DB::rollBack(); - $this->setError($e->getMessage()); - return false; + throw new Exception($e->getMessage()); } } @@ -84,8 +83,7 @@ class AdminService extends BaseService return true; }catch (Exception $e){ DB::rollBack(); - $this->setError($e->getMessage()); - return false; + throw new Exception($e->getMessage()); } } @@ -125,8 +123,7 @@ class AdminService extends BaseService { $primaryKey = $this->model->getKeyName(); if (isset($params[$primaryKey]) && $params[$primaryKey] == 1){ - $this->setError('超管禁止删除!'); - return false; + throw new Exception('超管禁止删除!'); } // 如果是批量删除,那么移除Id if(isset($params['is_batch']) && $params['is_batch'] == 1){ diff --git a/app/Modules/Admin/Services/ArticleService.php b/app/Modules/Admin/Services/ArticleService.php index 0419b2b55bf2310b9a164aa75f31f34893a4931b..5e132302dbec660db7ded3a8ccd9611a42e20221 100644 --- a/app/Modules/Admin/Services/ArticleService.php +++ b/app/Modules/Admin/Services/ArticleService.php @@ -76,9 +76,8 @@ class ArticleService extends BaseService DB::commit(); return true; }catch (Exception $e){ - var_dump($e->getMessage()); DB::rollBack(); - return false; + throw new Exception($e->getMessage()); } } @@ -98,7 +97,7 @@ class ArticleService extends BaseService return true; }catch (Exception $e){ DB::rollBack(); - return false; + throw new Exception($e->getMessage()); } } diff --git a/app/Modules/Admin/Services/BaseService.php b/app/Modules/Admin/Services/BaseService.php index 9189b67ae8e060f34f8bf2ecc5306a284178c17b..a1ea49a39162dc723138761644ebb390f11f9145 100644 --- a/app/Modules/Admin/Services/BaseService.php +++ b/app/Modules/Admin/Services/BaseService.php @@ -105,8 +105,7 @@ class BaseService extends Service { $primaryKey = $this->model->getKeyName(); if ( empty($params[$primaryKey]) && empty($params['is_batch'])) { - $this->setError('请指定删除标识!'); - return false; + throw new Exception('请指定删除标识!'); } // 是否为批量删除 if (isset($params['is_batch']) && $params['is_batch'] == 1){ @@ -133,15 +132,13 @@ class BaseService extends Service { $primaryKey = $this->model->getKeyName(); if (empty($params[$primaryKey])) { - $this->setError('请指定删除标识!'); - return false; + throw new Exception('请指定标识!'); } if ( $this->model->where([$primaryKey => $params[$primaryKey]])->update([$params['change_field'] => $params['change_value']]) ) { $this->setError('设置成功!'); return true; } else { - $this->setError('设置失败!'); - return false; + throw new Exception('设置失败!'); } } diff --git a/app/Modules/Admin/Services/DatabaseService.php b/app/Modules/Admin/Services/DatabaseService.php index b0efed2a65a58aeafaeca653fbae35c7df7aa7de..206355b3273e7da36a7c34022ef62689c1d04c0f 100644 --- a/app/Modules/Admin/Services/DatabaseService.php +++ b/app/Modules/Admin/Services/DatabaseService.php @@ -2,6 +2,7 @@ namespace App\Modules\Admin\Services; +use App\Exceptions\Exception; use App\Handlers\DatabaseHandler; use App\Models\TableBackup; use App\Models\UploadFile; @@ -92,7 +93,7 @@ class DatabaseService extends BaseService if ( $res ) { return $result; } else { - return false; + throw new Exception($this->error); } } @@ -144,8 +145,7 @@ class DatabaseService extends BaseService $this->error = '备份记录删除成功!'; return true; }else{ - $this->error = '备份记录删除失败,请重试!'; - return false; + throw new Exception('备份记录删除失败,请重试!'); } } } diff --git a/app/Modules/Admin/Services/FileService.php b/app/Modules/Admin/Services/FileService.php index 388d89923d5308c1204c9e46f78f4c084e5cfd5f..6436e8306ba1fe62e4f43401e2d4eb10b0dedea6 100644 --- a/app/Modules/Admin/Services/FileService.php +++ b/app/Modules/Admin/Services/FileService.php @@ -2,6 +2,7 @@ namespace App\Modules\Admin\Services; +use App\Exceptions\Exception; use App\Models\UploadFile; class FileService extends BaseService @@ -36,8 +37,7 @@ class FileService extends BaseService $this->error = '移动成功!'; return true; }else{ - $this->error = '移动失败!'; - return false; + throw new Exception('移动失败!'); } } }