调整目录结构

app/Admin/Controllers/AdController.php

@@ -2,15 +2,15 @@
 
 namespace App\Admin\Controllers;
 
-use Slowlyo\OwlAdmin\Admin;
-use Slowlyo\OwlAdmin\Renderers\Page;
-use Slowlyo\OwlAdmin\Renderers\Form;
-use Slowlyo\OwlAdmin\Controllers\AdminController;
-use Slowlyo\OwlAdmin\Renderers\Operation;
-use App\Services\Admin\AdService;
 use App\Admin\Components;
-use App\Models\Keyword;
+use App\Admin\Services\AdService;
 use App\Models\Ad;
+use App\Models\Keyword;
+use Slowlyo\OwlAdmin\Admin;
+use Slowlyo\OwlAdmin\Controllers\AdminController;
+use Slowlyo\OwlAdmin\Renderers\Form;
+use Slowlyo\OwlAdmin\Renderers\Operation;
+use Slowlyo\OwlAdmin\Renderers\Page;
 
 /**
  * 广告管理

app/Admin/Controllers/AdminUserController.php

@@ -2,14 +2,13 @@
 
 namespace App\Admin\Controllers;
 
-use Slowlyo\OwlAdmin\Renderers\Page;
+use App\Admin\Services\AdminUserService;
+use Slowlyo\OwlAdmin\Controllers\AdminController;
 use Slowlyo\OwlAdmin\Renderers\Form;
 use Slowlyo\OwlAdmin\Renderers\Operation;
+use Slowlyo\OwlAdmin\Renderers\Page;
 use Slowlyo\OwlAdmin\Renderers\SwitchControl;
-use Slowlyo\OwlAdmin\Renderers\TableColumn;
-use App\Services\Admin\AdminUserService;
 use Slowlyo\OwlAdmin\Services\AdminRoleService;
-use Slowlyo\OwlAdmin\Controllers\AdminController;
 
 /**
  * @property AdminUserService $service

app/Admin/Controllers/ArticleController.php

@@ -2,15 +2,15 @@
 
 namespace App\Admin\Controllers;
 
-use App\Casts\Storage;
-use Slowlyo\OwlAdmin\Admin;
-use Slowlyo\OwlAdmin\Renderers\Page;
-use Slowlyo\OwlAdmin\Renderers\Form;
-use Slowlyo\OwlAdmin\Controllers\AdminController;
-use App\Services\Admin\ArticleService;
 use App\Admin\Components;
+use App\Admin\Services\ArticleService;
+use App\Casts\Storage;
 use App\Models\Keyword;
 use App\Traits\CustomActionTrait;
+use Slowlyo\OwlAdmin\Admin;
+use Slowlyo\OwlAdmin\Controllers\AdminController;
+use Slowlyo\OwlAdmin\Renderers\Form;
+use Slowlyo\OwlAdmin\Renderers\Page;
 
 class ArticleController extends AdminController
 {

app/Admin/Controllers/Hr/EmployeeController.php

@@ -2,13 +2,13 @@
 
 namespace App\Admin\Controllers\Hr;
 
-use Slowlyo\OwlAdmin\Controllers\AdminController;
+use App\Admin\Services\EmployeeService;
-use App\Services\Admin\EmployeeService;
-use Slowlyo\OwlAdmin\Renderers\Page;
-use Slowlyo\OwlAdmin\Renderers\Form;
 use App\Enums\EmployeeStatus;
 use App\Models\Employee;
 use Illuminate\Http\Request;
+use Slowlyo\OwlAdmin\Controllers\AdminController;
+use Slowlyo\OwlAdmin\Renderers\Form;
+use Slowlyo\OwlAdmin\Renderers\Page;
 
 class EmployeeController extends AdminController
 {

app/Admin/Controllers/KeywordController.php

@@ -2,14 +2,14 @@
 
 namespace App\Admin\Controllers;
 
-use Slowlyo\OwlAdmin\Renderers\Page;
+use App\Admin\Components;
+use App\Admin\Services\KeywordService;
+use Illuminate\Http\Request;
+use Slowlyo\OwlAdmin\Controllers\AdminController;
 use Slowlyo\OwlAdmin\Renderers\Form;
+use Slowlyo\OwlAdmin\Renderers\Page;
 use Slowlyo\OwlAdmin\Renderers\TableColumn;
 use Slowlyo\OwlAdmin\Renderers\TextControl;
-use Slowlyo\OwlAdmin\Controllers\AdminController;
-use App\Services\Admin\KeywordService;
-use App\Admin\Components;
-use Illuminate\Http\Request;
 
 class KeywordController extends AdminController
 {

app/Admin/Controllers/Store/StoreController.php

@@ -2,10 +2,10 @@
 
 namespace App\Admin\Controllers\Store;
 
+use App\Admin\Services\StoreService;
 use Slowlyo\OwlAdmin\Controllers\AdminController;
-use App\Services\Admin\StoreService;
-use Slowlyo\OwlAdmin\Renderers\Page;
 use Slowlyo\OwlAdmin\Renderers\Form;
+use Slowlyo\OwlAdmin\Renderers\Page;
 
 class StoreController extends AdminController
 {

app/Admin/Filters/AdFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Filters;
+namespace App\Admin\Filters;
 
 use Illuminate\Support\Arr;
 use EloquentFilter\ModelFilter;

app/Admin/Filters/ArticleFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Filters;
+namespace App\Admin\Filters;
 
 use EloquentFilter\ModelFilter;
 use Illuminate\Support\Arr;

app/Admin/Filters/EmployeeFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Filters;
+namespace App\Admin\Filters;
 
 use EloquentFilter\ModelFilter;
 

app/Admin/Filters/KeywordFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Filters;
+namespace App\Admin\Filters;
 
 use EloquentFilter\ModelFilter;
 use App\Models\Keyword;

app/Admin/Filters/StoreFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Filters;
+namespace App\Admin\Filters;
 
 use EloquentFilter\ModelFilter;
 

app/Admin/Services/AdService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Admin;
+namespace App\Admin\Services;
 
+use App\Admin\Filters\AdFilter;
 use App\Models\Ad;
-use App\Models\Filters\AdFilter;
 use App\Traits\UploadTrait;
 use Illuminate\Support\Arr;
 

app/Admin/Services/AdminUserService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin;
+namespace App\Admin\Services;
 
 use Illuminate\Support\Arr;
 use Slowlyo\OwlAdmin\Admin;

app/Admin/Services/ArticleService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Admin;
+namespace App\Admin\Services;
 
+use App\Admin\Filters\ArticleFilter;
 use App\Models\Article;
-use App\Models\Filters\ArticleFilter;
 use App\Traits\UploadTrait;
 use Illuminate\Support\Arr;
 

app/Admin/Services/BaseService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin;
+namespace App\Admin\Services;
 
 use Slowlyo\OwlAdmin\Services\AdminService;
 

app/Admin/Services/EmployeeService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Admin;
+namespace App\Admin\Services;
 
+use App\Admin\Filters\EmployeeFilter;
 use App\Models\Employee;
-use App\Models\Filters\EmployeeFilter;
 use Illuminate\Support\Facades\Validator;
 use Slowlyo\OwlAdmin\Services\AdminUserService;
 use Slowlyo\OwlAdmin\Models\AdminUser;

app/Admin/Services/KeywordService.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Services\Admin;
+namespace App\Admin\Services;
 
-use Illuminate\Support\Arr;
+use App\Admin\Filters\KeywordFilter;
 use App\Models\Keyword;
-use App\Models\Filters\KeywordFilter;
+use Illuminate\Support\Arr;
 
 /**
  * @method Keyword getModel()

app/Admin/Services/StoreService.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Admin;
+namespace App\Admin\Services;
 
+use App\Admin\Filters\StoreFilter;
 use App\Models\Store;
-use App\Models\Filters\StoreFilter;
 use App\Enums\StoreRole;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;