Переглянути джерело

refactor(module): 调整代码结构和路由

- 更新 FriendRequestRepository 继承的类
- 移除 GameItemsServiceProvider 中的路由定义
- 修改 UserRelatedPagesAction 中的物品背包链接
- 删除 ViewConfigController 相关的自动加载配置
notfff 7 місяців тому
батько
коміт
7363308334

+ 9 - 9
app/Module/Friend/Repositories/FriendRequestRepository.php

@@ -4,7 +4,7 @@ namespace App\Module\Friend\Repositories;
 
 use App\Module\Friend\Models\FriendRequest;
 use Illuminate\Pagination\LengthAwarePaginator;
-use UCore\EloquentRepository;
+use UCore\DcatAdmin\Repository\EloquentRepository;
 
 /**
  * 好友申请仓库
@@ -32,20 +32,20 @@ class FriendRequestRepository extends EloquentRepository
     public function getList(array $where, int $page = 1, int $limit = 20): LengthAwarePaginator
     {
         $query = FriendRequest::query();
-        
+
         // 应用查询条件
         foreach ($where as $key => $value) {
             if ($key === '_sort_field' || $key === '_sort_order') {
                 continue;
             }
-            
+
             if (is_array($value) && count($value) === 3) {
                 $query->where($key, $value[0], $value[1]);
             } else {
                 $query->where($key, $value);
             }
         }
-        
+
         // 应用排序
         if (isset($where['_sort_field']) && isset($where['_sort_order'])) {
             $query->orderBy($where['_sort_field'], $where['_sort_order']);
@@ -53,7 +53,7 @@ class FriendRequestRepository extends EloquentRepository
             // 默认按ID降序排列
             $query->orderBy('id', 'desc');
         }
-        
+
         return $query->paginate($limit, ['*'], 'page', $page);
     }
 
@@ -66,7 +66,7 @@ class FriendRequestRepository extends EloquentRepository
     public function findByWhere(array $where): ?FriendRequest
     {
         $query = FriendRequest::query();
-        
+
         foreach ($where as $key => $value) {
             if (is_array($value) && count($value) === 3) {
                 $query->where($key, $value[0], $value[1]);
@@ -74,7 +74,7 @@ class FriendRequestRepository extends EloquentRepository
                 $query->where($key, $value);
             }
         }
-        
+
         return $query->first();
     }
 
@@ -87,7 +87,7 @@ class FriendRequestRepository extends EloquentRepository
     public function countByWhere(array $where): int
     {
         $query = FriendRequest::query();
-        
+
         foreach ($where as $key => $value) {
             if (is_array($value) && count($value) === 3) {
                 $query->where($key, $value[0], $value[1]);
@@ -95,7 +95,7 @@ class FriendRequestRepository extends EloquentRepository
                 $query->where($key, $value);
             }
         }
-        
+
         return $query->count();
     }
 }

+ 0 - 6
app/Module/GameItems/Providers/GameItemsServiceProvider.php

@@ -92,12 +92,6 @@ class GameItemsServiceProvider extends ServiceProvider
             'middleware' => config('admin.route.middleware'),
         ];
 
-        app('router')->group($attributes, function ($router) {
-            // 宝箱开启消耗配置路由
-            $router->resource('game-items/chest-open-costs', \App\Module\GameItems\AdminControllers\ItemChestOpenCostAdminController::class);
 
-            // 复制消耗配置到其他宝箱的路由
-            $router->post('game-items/chest-open-costs/copy', [\App\Module\GameItems\AdminControllers\ItemChestOpenCostAdminController::class, 'copy']);
-        });
     }
 }

+ 1 - 1
app/Module/User/AdminControllers/Actions/UserRelatedPagesAction.php

@@ -38,7 +38,7 @@ class UserRelatedPagesAction extends RowAction
             "<a href='" . admin_url("task-user-tasks?user_id={$userId}") . "'><i class='fa fa-tasks'></i> 用户任务</a>",
             Dropdown::DIVIDER,
             "<a href='" . admin_url("fund-accounts?user_id={$userId}") . "'><i class='fa fa-money'></i> 资金账户</a>",
-            "<a href='" . admin_url("game-items-users?user_id={$userId}") . "'><i class='fa fa-cubes'></i> 物品背包</a>",
+            "<a href='" . admin_url("game-items-user-items?user_id={$userId}") . "'><i class='fa fa-cubes'></i> 物品背包</a>",
             "<a href='" . admin_url("farm-lands?user_id={$userId}") . "'><i class='fa fa-map'></i> 土地管理</a>",
             "<a href='" . admin_url("farm-crops?user_id={$userId}") . "'><i class='fa fa-pagelines'></i> 种植作物</a>",
             "<a href='" . admin_url("farm-god-buffs?user_id={$userId}") . "'><i class='fa fa-magic'></i> 神像加持</a>",

+ 0 - 1
vendor/composer/autoload_classmap.php

@@ -927,7 +927,6 @@ return array(
     'App\\Module\\System\\AdminControllers\\NoticeTempleteController' => $baseDir . '/app/Module/System/AdminControllers/NoticeTempleteController.php',
     'App\\Module\\System\\AdminControllers\\SystemLogController' => $baseDir . '/app/Module/System/AdminControllers/SystemLogController.php',
     'App\\Module\\System\\AdminControllers\\ToolController' => $baseDir . '/app/Module/System/AdminControllers/ToolController.php',
-    'App\\Module\\System\\AdminControllers\\ViewConfigController' => $baseDir . '/app/Module/System/AdminControllers/ViewConfigController.php',
     'App\\Module\\System\\AdminForms\\CacheClear' => $baseDir . '/app/Module/System/AdminForms/CacheClear.php',
     'App\\Module\\System\\AdminForms\\CacheClearTag' => $baseDir . '/app/Module/System/AdminForms/CacheClearTag.php',
     'App\\Module\\System\\AdminForms\\Setting' => $baseDir . '/app/Module/System/AdminForms/Setting.php',

+ 0 - 1
vendor/composer/autoload_static.php

@@ -1647,7 +1647,6 @@ class ComposerStaticInita2207959542f13e6e79e83f2b0d9a425
         'App\\Module\\System\\AdminControllers\\NoticeTempleteController' => __DIR__ . '/../..' . '/app/Module/System/AdminControllers/NoticeTempleteController.php',
         'App\\Module\\System\\AdminControllers\\SystemLogController' => __DIR__ . '/../..' . '/app/Module/System/AdminControllers/SystemLogController.php',
         'App\\Module\\System\\AdminControllers\\ToolController' => __DIR__ . '/../..' . '/app/Module/System/AdminControllers/ToolController.php',
-        'App\\Module\\System\\AdminControllers\\ViewConfigController' => __DIR__ . '/../..' . '/app/Module/System/AdminControllers/ViewConfigController.php',
         'App\\Module\\System\\AdminForms\\CacheClear' => __DIR__ . '/../..' . '/app/Module/System/AdminForms/CacheClear.php',
         'App\\Module\\System\\AdminForms\\CacheClearTag' => __DIR__ . '/../..' . '/app/Module/System/AdminForms/CacheClearTag.php',
         'App\\Module\\System\\AdminForms\\Setting' => __DIR__ . '/../..' . '/app/Module/System/AdminForms/Setting.php',