diff --git a/packages/dcat-extension-plus-master/resources/assets/css/index.css b/packages/dcat-extension-plus-master/resources/assets/css/index.css deleted file mode 100644 index e69de29..0000000 diff --git a/packages/dcat-extension-plus-master/resources/assets/js/index.js b/packages/dcat-extension-plus-master/resources/assets/js/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/packages/dcat-extension-plus-master/src/ServiceProvider.php b/packages/dcat-extension-plus-master/src/ServiceProvider.php index 65c5fe9..e40bc8e 100644 --- a/packages/dcat-extension-plus-master/src/ServiceProvider.php +++ b/packages/dcat-extension-plus-master/src/ServiceProvider.php @@ -13,12 +13,6 @@ use Dcat\Admin\Extend\ServiceProvider as BaseServiceProvider; */ class ServiceProvider extends BaseServiceProvider { - protected $js = [ - 'js/index.js', - ]; - protected $css = [ - 'css/index.css', - ]; protected $middleware = [ 'before' => [ BeforeInjectDcatPlus::class, diff --git a/packages/dcat-extension-plus-master/src/Support.php b/packages/dcat-extension-plus-master/src/Support.php index e6c11a3..bbc6c2f 100644 --- a/packages/dcat-extension-plus-master/src/Support.php +++ b/packages/dcat-extension-plus-master/src/Support.php @@ -84,8 +84,8 @@ class Support config([ 'app.url' => $site_url, 'app.debug' => (bool)$site_debug, - 'app.locale' => admin_setting('site_lang'), - 'app.fallback_locale' => admin_setting('site_lang'), + 'app.locale' => admin_setting('site_lang', config('app.locale')), + 'app.fallback_locale' => admin_setting('site_lang', config('app.fallback_locale')), 'admin.title' => admin_setting('site_title'), 'admin.logo' => $logo, diff --git a/packages/keywords/src/Http/routes.php b/packages/keywords/src/Http/routes.php index a0f45b6..f596189 100644 --- a/packages/keywords/src/Http/routes.php +++ b/packages/keywords/src/Http/routes.php @@ -4,19 +4,7 @@ namespace Peidikeji\Keywords\Http\Controllers; use Illuminate\Support\Facades\Route; -Route::group([ - 'prefix' => config('admin.route.prefix'), - 'middleware' => config('admin.route.middleware'), -], function () { - Route::get('api/keywords', [KeywordsController::class, 'list'])->name('api.keywords'); +Route::get('api/keywords', [KeywordsController::class, 'list'])->name('api.keywords'); - Route::resource('keywords', KeywordsController::class)->names('keywords'); -}); - -Route::group([ - 'prefix' => 'api', - 'middleware' => 'api' -], function () { - Route::get('keywords', [KeywordsController::class, 'json']); -}); +Route::resource('keywords', KeywordsController::class)->names('keywords'); diff --git a/src/Admin.php b/src/Admin.php index 86721ff..6321540 100755 --- a/src/Admin.php +++ b/src/Admin.php @@ -542,7 +542,7 @@ class Admin $jsVariables['pjax_container_selector'] = $pjaxId ? ('#'.$pjaxId) : ''; $jsVariables['token'] = csrf_token(); - $jsVariables['lang'] = ($lang = is_array(__('admin.client')) ? __('admin.client'): []) ? array_merge($lang, $jsVariables['lang'] ?? []) : []; + $jsVariables['lang'] = ($lang = __('admin.client')) ? array_merge($lang, $jsVariables['lang'] ?? []) : []; $jsVariables['colors'] = static::color()->all(); $jsVariables['dark_mode'] = static::isDarkMode(); $jsVariables['sidebar_dark'] = config('admin.layout.sidebar_dark') || ($sidebarStyle === 'dark');