调整目录结构

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;
 
 /**
  * 广告管理
@@ -42,7 +42,7 @@ class AdController extends AdminController
                 ]),
                 amis()->GroupControl()->mode('horizontal')->body([
                     amis()->InputDatetimeRange()->label(__('admin.ads.published_at'))->name('published_at'),
-                    amis()->InputDatetimeRange()->label(__('admin.created_at'))->name('created_at'),  
+                    amis()->InputDatetimeRange()->label(__('admin.created_at'))->name('created_at'),
                 ]),
             ]))
             ->columns([

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,22 +2,22 @@
 
 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
 {
     use CustomActionTrait;
     protected string $serviceName = ArticleService::class;
 
-    public function list():Page 
+    public function list():Page
     {
         $crud = $this->baseCRUD()->tableLayout('fixed')
             ->headerToolbar([
@@ -33,7 +33,7 @@ class ArticleController extends AdminController
                     Components::make()->parentControl(admin_url('api/keywords/tree-list?parent_name=article_category&has_owner=0'), 'category', __('admin.articles.category'), 'name', 'key'),
                     Components::make()->keywordsTagControl('t_ids', __('admin.articles.tags'), 'article_tag'),
                 ]),
-                amis()->GroupControl()->mode('horizontal')->body([ 
+                amis()->GroupControl()->mode('horizontal')->body([
                     amis()->SelectControl('enable', __('admin.articles.is_enable'))
                         ->columnRatio(3)
                         ->options([
@@ -44,10 +44,10 @@ class ArticleController extends AdminController
                         ->options([
                             1=>'开启',0=>'关闭'
                         ]),
-                    amis()->InputDatetimeRange()->label(__('admin.articles.published_at'))->name('published_at'),        
+                    amis()->InputDatetimeRange()->label(__('admin.articles.published_at'))->name('published_at'),
                 ]),
                 amis()->GroupControl()->mode('horizontal')->body([
-                    amis()->InputDatetimeRange()->label(__('admin.created_at'))->name('created_at')->columnRatio(6),      
+                    amis()->InputDatetimeRange()->label(__('admin.created_at'))->name('created_at')->columnRatio(6),
                 ]),
             ]))
             ->itemBadge([//行角标
@@ -106,4 +106,4 @@ class ArticleController extends AdminController
         return $this->baseDetail()->body([]);
     }
 
-}
+}

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
 {
@@ -34,7 +34,7 @@ class KeywordController extends AdminController
                 amis()->TextControl('parent_name', __('admin.keywords.parent_keyword'))
                     ->size('md')
                     ->placeholder(__('admin.keywords.search_name'))
-                ]   
+                ]
             ))
             ->columns([
                 // TableColumn::make()->name('id')->label('ID')->sortable(true),

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;
@@ -24,7 +24,7 @@ class KeywordFilter extends ModelFilter
                 ->orWhere('key','like', '%'.$parent_name.'%');
             });
         }
-        return $this->orWhere('path','like', '%-'. 
+        return $this->orWhere('path','like', '%-'.
                         Keyword::where('name','like', '%'.$parent_name.'%')->orWhere('key','like', '%'.$parent_name.'%')->value('id')
             . '-%' ?? '');
     }

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;
 
@@ -73,11 +73,11 @@ class AdService extends BaseService
 
         $isEnable = Arr::get($data, 'is_enable');
         $publishedAt = Arr::get($data, 'published_at');
-        
+
         if ($isEnable && empty($publishedAt) && empty($model->published_at)) {
             $data['published_at'] = now();
         }
-        
+
         if(isset($data['resource'])){
             $data['resource'] = $this->saveImage('resource', 'ads/resource')[0];
         }
@@ -111,4 +111,4 @@ class AdService extends BaseService
 
         return $model->save();
     }
-}
+}

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;
 
@@ -53,7 +53,7 @@ class ArticleService extends BaseService
 
         $isEnable = Arr::get($data, 'is_enable');
         $publishedAt = Arr::get($data, 'published_at');
-        
+
         if ($isEnable && empty($publishedAt) && empty($model->published_at)) {
             $data['published_at'] = now();
         }
@@ -61,7 +61,7 @@ class ArticleService extends BaseService
         if(isset($data['cover'])){
             $data['cover'] = $this->saveImage('cover', 'articles/cover')[0] ?? '';
         }
-        
+
         if(isset($data['appendixes'])){
             $data['appendixes'] = $this->saveFile('appendixes', 'articles/appendixes');
         }
@@ -76,4 +76,4 @@ class ArticleService extends BaseService
 
         return $model->save();
     }
-}
+}

app/Admin/Services/BaseService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Admin;
+namespace App\Admin\Services;
 
 use Slowlyo\OwlAdmin\Services\AdminService;
 
@@ -45,9 +45,9 @@ class BaseService extends AdminService
         if($this->modelSortAble){
             $query->sort();
         }
-            
+
         $this->sortable($query);
-        
+
         return $query;
     }
 

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;
@@ -14,7 +14,7 @@ use Illuminate\Database\Eloquent\Builder;
 class EmployeeService extends BaseService
 {
     protected array $withRelationships = ['jobs', 'adminUser'];
-    
+
     protected string $modelName = Employee::class;
 
     protected string $modelFilterName = EmployeeFilter::class;
@@ -92,7 +92,7 @@ class EmployeeService extends BaseService
 
     /**
      * 处理职位关联
-     * 
+     *
      * @param Employee $model
      * @param array $jobs(字典表 key 组成的数组)
      */

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;
@@ -11,7 +11,7 @@ use Illuminate\Validation\Rule;
 class StoreService extends BaseService
 {
     protected array $withRelationships = ['category', 'level', 'business', 'master'];
-    
+
     protected string $modelName = Store::class;
 
     protected string $modelFilterName = StoreFilter::class;
@@ -49,7 +49,7 @@ class StoreService extends BaseService
             $store->employees()->detach($model->master_id);
             $store->employees()->attach([$data['master_id'] => ['role' => StoreRole::Master]]);
         }
-        
+
         return $model->update($data);
     }
 
@@ -85,4 +85,4 @@ class StoreService extends BaseService
         }
         return true;
     }
-}
+}