diff --git a/beike/Admin/Http/Controllers/PluginController.php b/beike/Admin/Http/Controllers/PluginController.php index 4a9fdc87..22640ea7 100644 --- a/beike/Admin/Http/Controllers/PluginController.php +++ b/beike/Admin/Http/Controllers/PluginController.php @@ -26,7 +26,7 @@ class PluginController extends Controller */ public function index() { - $plugins = (new Manager)->getPlugins(); + $plugins = app('plugin')->getPlugins(); $data['plugins'] = array_values(PluginResource::collection($plugins)->jsonSerialize()); return view('admin::pages.plugins.index', $data); } @@ -49,7 +49,7 @@ class PluginController extends Controller */ public function install(Request $request, $code): array { - $plugin = (new Manager)->getPluginOrFail($code); + $plugin = app('plugin')->getPluginOrFail($code); PluginRepo::installPlugin($plugin); return json_success("安装成功"); } @@ -63,7 +63,7 @@ class PluginController extends Controller */ public function uninstall(Request $request, $code): array { - $plugin = (new Manager)->getPluginOrFail($code); + $plugin = app('plugin')->getPluginOrFail($code); PluginRepo::uninstallPlugin($plugin); return json_success("卸载成功"); } @@ -77,7 +77,7 @@ class PluginController extends Controller */ public function edit(Request $request, $code): View { - $data['plugin'] = (new Manager)->getPluginOrFail($code); + $data['plugin'] = app('plugin')->getPluginOrFail($code); return view('admin::pages.plugins.form', $data); } @@ -90,7 +90,7 @@ class PluginController extends Controller */ public function update(Request $request, $code): array { - (new Manager)->getPluginOrFail($code); + app('plugin')->getPluginOrFail($code); $fields = $request->all(); SettingRepo::update('plugin', $code, $fields); return json_success("编辑成功"); @@ -105,7 +105,7 @@ class PluginController extends Controller */ public function updateStatus(Request $request, $code): array { - (new Manager)->getPluginOrFail($code); + app('plugin')->getPluginOrFail($code); $status = $request->get('status'); SettingRepo::update('plugin', $code, ['status' => $status]); return json_success("编辑成功"); diff --git a/beike/Repositories/PluginRepo.php b/beike/Repositories/PluginRepo.php index 04799b03..58a3f80c 100644 --- a/beike/Repositories/PluginRepo.php +++ b/beike/Repositories/PluginRepo.php @@ -134,7 +134,7 @@ class PluginRepo { $allPlugins = self::allPlugins(); return $allPlugins->where('type', 'shipping')->filter(function ($item) { - $plugin = (new Manager)->getPlugin($item->code); + $plugin = app('plugin')->getPlugin($item->code); if ($plugin) { $item->plugin = $plugin; } @@ -150,7 +150,7 @@ class PluginRepo { $allPlugins = self::allPlugins(); return $allPlugins->where('type', 'payment')->filter(function ($item) { - $plugin = (new Manager)->getPlugin($item->code); + $plugin = app('plugin')->getPlugin($item->code); if ($plugin) { $item->plugin = $plugin; } diff --git a/beike/Shop/Providers/PluginServiceProvider.php b/beike/Shop/Providers/PluginServiceProvider.php index 04f39d87..817b24b8 100644 --- a/beike/Shop/Providers/PluginServiceProvider.php +++ b/beike/Shop/Providers/PluginServiceProvider.php @@ -32,12 +32,10 @@ class PluginServiceProvider extends ServiceProvider /** * Bootstrap Plugin Service Provider - * - * @param Manager $manager - * @throws \Exception */ - public function boot(Manager $manager) + public function boot() { + $manager = app('plugin'); $plugins = $manager->getPlugins(); $bootstraps = $manager->getEnabledBootstraps(); $pluginBasePath = base_path('plugins');