From f3592265cb2316dac6de0e36d1cc8c84d0053ab5 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Thu, 19 Jan 2023 15:55:38 +0800 Subject: [PATCH] chore: update module --- modules/Common/Providers/CommonServiceProvider.php | 4 ++-- modules/Develop/Providers/DevelopServiceProvider.php | 4 ++-- modules/Develop/Support/Generate/stubs/provider.stub | 8 ++++---- .../Permissions/Providers/PermissionsServiceProvider.php | 4 ++-- modules/Permissions/config/ok.php | 4 ++++ modules/Permissions/config/oks.php | 4 ++++ modules/User/Providers/UserServiceProvider.php | 4 ++-- public/admin.html | 2 +- 8 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 modules/Permissions/config/ok.php create mode 100644 modules/Permissions/config/oks.php diff --git a/modules/Common/Providers/CommonServiceProvider.php b/modules/Common/Providers/CommonServiceProvider.php index 35cc03b..348fafc 100644 --- a/modules/Common/Providers/CommonServiceProvider.php +++ b/modules/Common/Providers/CommonServiceProvider.php @@ -15,9 +15,9 @@ class CommonServiceProvider extends CatchModuleServiceProvider * * @return string|array */ - public function routePath(): string|array + public function moduleName(): string|array { // TODO: Implement path() method. - return CatchAdmin::getModuleRoutePath('common'); + return 'common'; } } diff --git a/modules/Develop/Providers/DevelopServiceProvider.php b/modules/Develop/Providers/DevelopServiceProvider.php index 372a649..50ba8b7 100644 --- a/modules/Develop/Providers/DevelopServiceProvider.php +++ b/modules/Develop/Providers/DevelopServiceProvider.php @@ -22,9 +22,9 @@ class DevelopServiceProvider extends CatchModuleServiceProvider * * @return string|array */ - public function routePath(): string|array + public function moduleName(): string|array { // TODO: Implement path() method. - return CatchAdmin::getModuleRoutePath('develop'); + return 'develop'; } } diff --git a/modules/Develop/Support/Generate/stubs/provider.stub b/modules/Develop/Support/Generate/stubs/provider.stub index ba43e83..44b6468 100644 --- a/modules/Develop/Support/Generate/stubs/provider.stub +++ b/modules/Develop/Support/Generate/stubs/provider.stub @@ -10,11 +10,11 @@ class {Module}ServiceProvider extends CatchModuleServiceProvider /** * route path * - * @return string|array + * @return string */ - public function routePath(): string|array + public function moduleName(): string { // TODO: Implement path() method. - return CatchAdmin::getModuleRoutePath('{module}'); + return '{module}'; } -} \ No newline at end of file +} diff --git a/modules/Permissions/Providers/PermissionsServiceProvider.php b/modules/Permissions/Providers/PermissionsServiceProvider.php index 7fa1024..6a886c1 100644 --- a/modules/Permissions/Providers/PermissionsServiceProvider.php +++ b/modules/Permissions/Providers/PermissionsServiceProvider.php @@ -23,9 +23,9 @@ class PermissionsServiceProvider extends CatchModuleServiceProvider * * @return string|array */ - public function routePath(): string|array + public function moduleName(): string|array { // TODO: Implement path() method. - return CatchAdmin::getModuleRoutePath('Permissions'); + return 'permissions'; } } diff --git a/modules/Permissions/config/ok.php b/modules/Permissions/config/ok.php new file mode 100644 index 0000000..5d27f3e --- /dev/null +++ b/modules/Permissions/config/ok.php @@ -0,0 +1,4 @@ + true +]; diff --git a/modules/Permissions/config/oks.php b/modules/Permissions/config/oks.php new file mode 100644 index 0000000..5d27f3e --- /dev/null +++ b/modules/Permissions/config/oks.php @@ -0,0 +1,4 @@ + true +]; diff --git a/modules/User/Providers/UserServiceProvider.php b/modules/User/Providers/UserServiceProvider.php index f55167b..2fd6f69 100644 --- a/modules/User/Providers/UserServiceProvider.php +++ b/modules/User/Providers/UserServiceProvider.php @@ -19,10 +19,10 @@ class UserServiceProvider extends CatchModuleServiceProvider * * @return string|array */ - public function routePath(): string|array + public function moduleName(): string|array { // TODO: Implement path() method. - return CatchAdmin::getModuleRoutePath('user'); + return 'user'; } /** diff --git a/public/admin.html b/public/admin.html index e84ea0a..738d745 100644 --- a/public/admin.html +++ b/public/admin.html @@ -4,7 +4,7 @@ - Vite App + CatchAdmin 后台系统