37

app/Module/Fund/AdminControllers/FundController.php

@@ -4,6 +4,7 @@ namespace App\Module\Fund\AdminControllers;
 
 use App\Module\Fund\Admin\Actions\Circulation;
 use App\Module\Fund\Admin\Actions\FundAdminAction;
+use App\Module\Fund\Repositorys\FundRepository;
 use App\Module\Fund\Services\AccountService;
 use Spatie\RouteAttributes\Attributes\Resource;
 use UCore\DcatAdmin\AdminController;
@@ -79,7 +80,7 @@ class FundController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make($id, new Fund(), function (Show $show) {
+        return Show::make($id, new FundRepository(), function (Show $show) {
             $show->field('id');
             $show->field('service_id');
             $show->field('title');

app/Module/GameItems/AdminControllers/CategoryController.php

@@ -2,6 +2,7 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
+use App\Module\GameItems\Repositorys\ItemCategoryRepository;
 use App\Module\GameItems\Models\ItemCategory;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -38,7 +39,7 @@ class CategoryController extends AdminController
             ->header($this->title)
             ->description('分类列表')
             ->body(function (Row $row) {
-                $tree = new Tree(new ItemCategory());
+                $tree = new Tree(new ItemCategoryRepository());
 
                 $tree->branch(function ($branch) {
                     $icon = $branch['icon'] ? "<img src='{$branch['icon']}' width='30' height='30'>" : '';
@@ -57,7 +58,7 @@ class CategoryController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemCategory(), function (Grid $grid) {
+        return Grid::make(new ItemCategoryRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             $helper->columnId();
             $grid->column('name', '名称');
@@ -75,7 +76,7 @@ class CategoryController extends AdminController
             $filter->like('name', '名称');
             $filter->like('code', '编码');
             $filter->equal('parent_id', '父分类')->select(
-                ItemCategory::pluck('name', 'id')
+                (new ItemCategoryRepository())->pluck('name', 'id')
             );});
         });
 
@@ -90,7 +91,7 @@ class CategoryController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemCategory::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemCategoryRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             $helper->field('id', 'ID');
             $helper->field('name', '名称');
@@ -118,7 +119,6 @@ class CategoryController extends AdminController
                 $items->name('名称');
                 $items->icon('图标')->image('', 50, 50);
                 $items->type('类型');
-                $items->rarity('稀有度');
             });
         });
     }
@@ -130,7 +130,7 @@ class CategoryController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemCategory(), function (Form $form) {
+        return Form::make(new ItemCategoryRepository(), function (Form $form) {
             $helper = new FormHelper($form, $this);
             $helper->text('name')->required();
             $helper->text('code')->required()->help('用于系统识别的唯一编码');
@@ -144,7 +144,7 @@ class CategoryController extends AdminController
             // 父分类选择，排除自己及其子分类
             $form->select('parent_id', '父分类')
                 ->options(function () use ($form) {
-                    $categories = ItemCategory::all();
+                    $categories = (new ItemCategoryRepository())->all();
                     $options = [0 => '无'];
 
                     // 如果是编辑状态，需要排除自己及其子分类
@@ -180,7 +180,7 @@ class CategoryController extends AdminController
     protected function getChildrenIds(int $categoryId): array
     {
         $ids = [];
-        $children = ItemCategory::where('parent_id', $categoryId)->get();
+        $children = (new ItemCategoryRepository())->where('parent_id', $categoryId)->get();
 
         foreach ($children as $child) {
             $ids[] = $child->id;

app/Module/GameItems/AdminControllers/ChestContentController.php

@@ -3,8 +3,9 @@
 namespace App\Module\GameItems\AdminControllers;
 
 use App\Module\GameItems\Enums\ITEM_TYPE;
-use App\Module\GameItems\Models\ItemChestContent;
-use App\Module\GameItems\Models\ItemGroup;
+use App\Module\GameItems\Repositorys\ItemChestContentRepository;
+use App\Module\GameItems\Repositorys\ItemGroupRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use App\Module\GameItems\Models\Item as ItemItem;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -33,7 +34,7 @@ class ChestContentController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemChestContent(), function (Grid $grid) {
+        return Grid::make(new ItemChestContentRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             $helper->columnId();
             $grid->column('chest.name', '宝箱名称');
@@ -53,13 +54,13 @@ class ChestContentController extends AdminController
                 $helper = new FilterHelper($filter, $this);
                 $helper->equal('id', 'ID');
                 $filter->equal('chest_id', '宝箱')->select(
-                    ItemItem::where('type', ITEM_TYPE::OPENABLE)->pluck('name', 'id')
+                    (new ItemRepository())->where('type', ITEM_TYPE::OPENABLE)->pluck('name', 'id')
                 );
                 $filter->equal('item_id', '物品')->select(
-                    ItemItem::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
                 $filter->equal('group_id', '物品组')->select(
-                    ItemGroup::pluck('name', 'id')
+                    (new ItemGroupRepository())->pluck('name', 'id')
                 );
             });
         });
@@ -73,7 +74,7 @@ class ChestContentController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemChestContent::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemChestContentRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             $helper->field('id', 'ID');
             $show->field('chest.name', '宝箱名称');
@@ -99,10 +100,10 @@ class ChestContentController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemChestContent(), function (Form $form) {
+        return Form::make(new ItemChestContentRepository(), function (Form $form) {
             $helper = new FormHelper($form, $this);
             $form->select('chest_id', '宝箱')
-                ->options(ItemItem::where('type', ITEM_TYPE::OPENABLE)->pluck('name', 'id'))
+                ->options((new ItemRepository())->where('type', ITEM_TYPE::OPENABLE)->pluck('name', 'id'))
                 ->required();
 
             // 物品和物品组二选一
@@ -111,12 +112,12 @@ class ChestContentController extends AdminController
                 ->default('item')
                 ->when('item', function (Form $form) {
                     $form->select('item_id', '物品')
-                        ->options(ItemItem::pluck('name', 'id'))
+                        ->options((new ItemRepository())->pluck('name', 'id'))
                         ->required();
                 })
                 ->when('group', function (Form $form) {
                     $form->select('group_id', '物品组')
-                        ->options(ItemGroup::pluck('name', 'id'))
+                        ->options((new ItemGroupRepository())->pluck('name', 'id'))
                         ->required();
                 });
 

app/Module/GameItems/AdminControllers/ChestOpenLogController.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemChestOpenLog;
-use App\Module\GameItems\Models\ItemItem;
+use App\Module\GameItems\Repositorys\ItemChestOpenLogRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
@@ -38,7 +38,7 @@ class ChestOpenLogController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemChestOpenLog(), function (Grid $grid) {
+        return Grid::make(new ItemChestOpenLogRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
 
             // 禁用创建、编辑和删除按钮
@@ -71,7 +71,7 @@ class ChestOpenLogController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
                 $filter->equal('chest_id', '宝箱')->select(
-                    ItemItem::where('type', 5)->pluck('name', 'id')
+                    (new ItemRepository())->where('type', 5)->pluck('name', 'id')
                 );
                 $filter->equal('pity_triggered', '触发保底')->radio([
                     1 => '是',
@@ -105,7 +105,7 @@ class ChestOpenLogController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemChestOpenLog::findOrFail($id), function (Show $show) {
+        return Show::make($id, new ItemChestOpenLogRepository(), function (Show $show) {
             $helper = new ShowHelper($show, $this);
 
             // 禁用编辑和删除按钮
@@ -143,7 +143,7 @@ class ChestOpenLogController extends AdminController
                         $html .= '<tbody>';
 
                         foreach ($chestResult as $item) {
-                            $itemInfo = ItemItem::find($item['item_id']);
+                            $itemInfo = (new ItemRepository())->find($item['item_id']);
                             $itemName = $itemInfo ? $itemInfo->name : '未知物品';
 
                             $html .= '<tr>';

app/Module/GameItems/AdminControllers/CraftLogController.php

@@ -2,9 +2,9 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemCraftLog;
-use App\Module\GameItems\Models\ItemRecipe;
-use App\Module\GameItems\Models\Item as ItemItem;
+use App\Module\GameItems\Repositorys\ItemCraftLogRepository;
+use App\Module\GameItems\Repositorys\ItemRecipeRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
@@ -39,7 +39,7 @@ class CraftLogController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemCraftLog(), function (Grid $grid) {
+        return Grid::make(new ItemCraftLogRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
 
             // 禁用创建、编辑和删除按钮
@@ -73,14 +73,14 @@ class CraftLogController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
                 $filter->equal('recipe_id', '配方')->select(
-                    ItemRecipe::pluck('name', 'id')
+                    (new ItemRecipeRepository())->pluck('name', 'id')
                 );
                 $filter->equal('is_success', '是否成功')->radio([
                     1 => '是',
                     0 => '否',
                 ]);
                 $filter->equal('result_item_id', '产出物品')->select(
-                    ItemItem::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
                 $filter->between('craft_time', '合成时间')->datetime();
             });
@@ -110,7 +110,7 @@ class CraftLogController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemCraftLog::findOrFail($id), function (Show $show) {
+        return Show::make($id, new ItemCraftLogRepository(), function (Show $show) {
             $helper = new ShowHelper($show, $this);
 
             // 禁用编辑和删除按钮
@@ -142,7 +142,7 @@ class CraftLogController extends AdminController
                     $html .= '<tbody>';
 
                     foreach ($materials as $material) {
-                        $itemInfo = ItemItem::find($material['item_id']);
+                        $itemInfo = (new ItemRepository())->find($material['item_id']);
                         $itemName = $itemInfo ? $itemInfo->name : '未知物品';
 
                         $html .= '<tr>';

app/Module/GameItems/AdminControllers/DismantleLogController.php

@@ -2,9 +2,9 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemDismantleLog;
-use App\Module\GameItems\Models\ItemItem;
-use App\Module\GameItems\Models\ItemDismantleRule;
+use App\Module\GameItems\Repositorys\ItemDismantleLogRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
+use App\Module\GameItems\Repositorys\ItemDismantleRuleRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
@@ -39,7 +39,7 @@ class DismantleLogController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemDismantleLog(), function (Grid $grid) {
+        return Grid::make(new ItemDismantleLogRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
 
             // 禁用创建、编辑和删除按钮
@@ -73,11 +73,11 @@ class DismantleLogController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
                 $filter->equal('item_id', '物品')->select(
-                    ItemItem::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
                 $helper->equal('instance_id', '实例ID');
                 $filter->equal('rule_id', '规则ID')->select(
-                    ItemDismantleRule::pluck('id', 'id')
+                    (new ItemDismantleRuleRepository())->pluck('id', 'id')
                 );
                 $filter->between('dismantle_time', '分解时间')->datetime();
             });
@@ -107,7 +107,7 @@ class DismantleLogController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemDismantleLog::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemDismantleLogRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
 
             // 禁用编辑和删除按钮
@@ -139,7 +139,7 @@ class DismantleLogController extends AdminController
                     $html .= '<tbody>';
 
                     foreach ($results as $result) {
-                        $itemInfo = ItemItem::find($result['item_id']);
+                        $itemInfo = (new ItemRepository())->find($result['item_id']);
                         $itemName = $itemInfo ? $itemInfo->name : '未知物品';
 
                         $html .= '<tr>';

app/Module/GameItems/AdminControllers/DismantleRuleController.php

@@ -2,9 +2,9 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemDismantleRule;
-use App\Module\GameItems\Models\ItemCategory;
-use App\Module\GameItems\Models\Item as ItemItem;
+use App\Module\GameItems\Repositorys\ItemDismantleRuleRepository;
+use App\Module\GameItems\Repositorys\ItemCategoryRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -33,7 +33,7 @@ class DismantleRuleController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemDismantleRule(), function (Grid $grid) {
+        return Grid::make(new ItemDismantleRuleRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
 
             $helper->columnId();
@@ -64,10 +64,10 @@ class DismantleRuleController extends AdminController
                 $helper = new FilterHelper($filter, $this);
                 $helper->equal('id', 'ID');
                 $filter->equal('item_id', '物品')->select(
-                    ItemItem::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
                 $filter->equal('category_id', '分类')->select(
-                    ItemCategory::pluck('name', 'id')
+                    (new ItemCategoryRepository())->pluck('name', 'id')
                 );
                 $filter->where('rule_type', function ($query) {
                     if ($this->input == 'item') {
@@ -110,7 +110,7 @@ class DismantleRuleController extends AdminController
      */
     protected function detail($id)
     {
-        $model = ItemDismantleRule::findOrFail($id);
+        $model = (new ItemDismantleRuleRepository())->findOrFail($id);
 
         return Show::make($model, function (Show $show) {
             $helper = new ShowHelper($show, $this);
@@ -205,7 +205,7 @@ class DismantleRuleController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemDismantleRule(), function (Form $form) {
+        return Form::make(new ItemDismantleRuleRepository(), function (Form $form) {
             $helper = new FormHelper($form, $this);
 
             // 规则类型

app/Module/GameItems/AdminControllers/GroupController.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemGroup;
-use App\Module\GameItems\Models\Item as ItemItem;
+use App\Module\GameItems\Repositorys\ItemGroupRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -31,7 +31,7 @@ class GroupController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemGroup(), function (Grid $grid) {
+        return Grid::make(new ItemGroupRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             $helper->columnId();
             $grid->column('name', '名称');
@@ -58,7 +58,7 @@ class GroupController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemGroup::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemGroupRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             $helper->field('id', 'ID');
             $helper->field('name', '名称');
@@ -84,7 +84,7 @@ class GroupController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemGroup(), function (Form $form) {
+        return Form::make(new ItemGroupRepository(), function (Form $form) {
             $helper = new FormHelper($form, $this);
             $helper->text('name')->required();
             $helper->text('code')->required()->help('用于系统识别的唯一编码');
@@ -93,7 +93,7 @@ class GroupController extends AdminController
             // 物品组内容
             $form->hasMany('groupItems', '物品组内容', function (Form\NestedForm $form) {
                 $form->select('item_id', '物品')
-                    ->options(ItemItem::pluck('name', 'id'))
+                    ->options((new ItemRepository())->pluck('name', 'id'))
                     ->required();
                 $form->number('weight', '权重')
                     ->default(1.0)

app/Module/GameItems/AdminControllers/GroupItemController.php

@@ -2,9 +2,9 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemGroup;
-use App\Module\GameItems\Models\ItemGroupItem;
-use App\Module\GameItems\Models\ItemItem;
+use App\Module\GameItems\Repositorys\ItemGroupItemRepository;
+use App\Module\GameItems\Repositorys\ItemGroupRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -32,7 +32,7 @@ class GroupItemController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemGroupItem(), function (Grid $grid) {
+        return Grid::make(new ItemGroupItemRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             $helper->columnId();
             $grid->column('group.name', '物品组');
@@ -46,10 +46,10 @@ class GroupItemController extends AdminController
                 $helper = new FilterHelper($filter, $this);
                 $helper->equal('id', 'ID');
                 $filter->equal('group_id', '物品组')->select(
-                    ItemGroup::pluck('name', 'id')
+                    (new ItemGroupRepository())->pluck('name', 'id')
                 );
                 $filter->equal('item_id', '物品')->select(
-                    ItemItem::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
             });
         });
@@ -63,7 +63,7 @@ class GroupItemController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemGroupItem::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemGroupItemRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             $helper->field('id', 'ID');
             $show->field('group.name', '物品组');
@@ -81,13 +81,13 @@ class GroupItemController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemGroupItem(), function (Form $form) {
+        return Form::make(new ItemGroupItemRepository(), function (Form $form) {
             $helper = new FormHelper($form, $this);
             $form->select('group_id', '物品组')
-                ->options(ItemGroup::pluck('name', 'id'))
+                ->options((new ItemGroupRepository())->pluck('name', 'id'))
                 ->required();
             $form->select('item_id', '物品')
-                ->options(ItemItem::pluck('name', 'id'))
+                ->options((new ItemRepository())->pluck('name', 'id'))
                 ->required();
             $helper->number('weight')
                 ->default(1.0)

app/Module/GameItems/AdminControllers/InstanceController.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemInstance;
-use App\Module\GameItems\Models\Item as ItemItem;
+use App\Module\GameItems\Repositorys\ItemInstanceRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -32,7 +32,7 @@ class InstanceController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemInstance(), function (Grid $grid) {
+        return Grid::make(new ItemInstanceRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             $helper->columnId();
             $grid->column('item.name', '基础物品');
@@ -50,7 +50,7 @@ class InstanceController extends AdminController
                 $helper = new FilterHelper($filter, $this);
                 $helper->equal('id', 'ID');
                 $filter->equal('item_id', '基础物品')->select(
-                    ItemItem::where('is_unique', 1)->pluck('name', 'id')
+                    (new ItemRepository())->where('is_unique', 1)->pluck('name', 'id')
                 );
                 $filter->like('name', '实例名称');
                 $filter->equal('tradable', '可交易')->radio([
@@ -91,7 +91,7 @@ class InstanceController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemInstance::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemInstanceRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             $helper->field('id', 'ID');
             $show->field('item.name', '基础物品');
@@ -217,10 +217,10 @@ class InstanceController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemInstance(), function (Form $form) {
+        return Form::make(new ItemInstanceRepository(), function (Form $form) {
             $helper = new FormHelper($form, $this);
             $form->select('item_id', '基础物品')
-                ->options(ItemItem::where('is_unique', 1)->pluck('name', 'id'))
+                ->options((new ItemRepository())->where('is_unique', 1)->pluck('name', 'id'))
                 ->required();
             $helper->text('name')
                 ->help('留空则使用基础物品名称');
@@ -252,7 +252,7 @@ class InstanceController extends AdminController
             $form->saving(function (Form $form) {
                 // 如果名称为空，使用基础物品名称
                 if (empty($form->name)) {
-                    $item = ItemItem::find($form->item_id);
+                    $item = (new ItemRepository())->find($form->item_id);
                     if ($item) {
                         $form->name = $item->name;
                     }

app/Module/GameItems/AdminControllers/ItemController.php

@@ -41,8 +41,6 @@ class ItemController extends AdminController
             $grid->column('name', '名称');
             $grid->column('category.name', '分类');
             $helper->columnModelCats('type');
-            $helper->columnModelCats('rarity');
-
 
             $grid->column('icon', '图标')->image('', 50, 50);
             $grid->column('is_unique', '单独属性')->bool();
@@ -100,12 +98,7 @@ class ItemController extends AdminController
             $show->field('name', '名称');
             $show->field('description', '描述');
             $show->field('category.name', '分类');
-            $show->field('type', '类型')->as(function ($type) {
-                return ITEM_TYPE::getName($type);
-            });
-            $show->field('rarity', '稀有度')->as(function ($rarity) {
-                return ITEM_RARITY::getName($rarity);
-            });
+            $helper->fieldModelCats('type');
             $show->field('icon', '图标')->image();
             $show->field('is_unique', '单独属性')->as(function ($isUnique) {
                 return $isUnique ? '是' : '否';

app/Module/GameItems/AdminControllers/OutputLimitController.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemOutputLimit;
-use App\Module\GameItems\Models\Item as ItemItem;
+use App\Module\GameItems\Repositorys\ItemOutputLimitRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -32,7 +32,7 @@ class OutputLimitController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemOutputLimit(), function (Grid $grid) {
+        return Grid::make(new ItemOutputLimitRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             $helper->columnId();
             $grid->column('item.name', '物品名称');
@@ -73,7 +73,7 @@ class OutputLimitController extends AdminController
                 $helper = new FilterHelper($filter, $this);
                 $helper->equal('id', 'ID');
                 $filter->equal('item_id', '物品')->select(
-                    ItemItem::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
                 $filter->equal('limit_type', '限制类型')->select([
                     ItemOutputLimit::LIMIT_TYPE_GLOBAL => '全局限制',
@@ -113,7 +113,7 @@ class OutputLimitController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemOutputLimit::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemOutputLimitRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             $helper->field('id', 'ID');
             $show->field('item.name', '物品名称');
@@ -189,9 +189,9 @@ class OutputLimitController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemOutputLimit(), function (Form $form) {
+        return Form::make(new ItemOutputLimitRepository(), function (Form $form) {
             $form->select('item_id', '物品')
-                ->options(ItemItem::pluck('name', 'id'))
+                ->options((new ItemRepository())->pluck('name', 'id'))
                 ->required();
 
             $form->select('limit_type', '限制类型')

app/Module/GameItems/AdminControllers/PityTimeController.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemPityTime;
-use App\Module\GameItems\Models\ItemItem;
+use App\Module\GameItems\Repositorys\ItemPityTimeRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
@@ -37,7 +37,7 @@ class PityTimeController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemPityTime(), function (Grid $grid) {
+        return Grid::make(new ItemPityTimeRepository(), function (Grid $grid) {
             // 禁用创建、编辑和删除按钮
             $grid->disableCreateButton();
             $grid->disableActions();
@@ -67,7 +67,7 @@ class PityTimeController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
                 $filter->equal('chest_id', '宝箱')->select(
-                    ItemItem::where('type', 5)->pluck('name', 'id')
+                    (new ItemRepository())->where('type', 5)->pluck('name', 'id')
                 );
                 $helper->equal('chest_content_id', '宝箱内容ID');
                 $helper->between('current_count', '当前计数');
@@ -98,7 +98,7 @@ class PityTimeController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemPityTime::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemPityTimeRepository())->findOrFail($id), function (Show $show) {
             // 禁用编辑和删除按钮
             $show->panel()->tools(function ($tools) {
                 $tools->disableEdit();

app/Module/GameItems/AdminControllers/RecipeController.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemRecipe;
-use App\Module\GameItems\Models\ItemItem;
+use App\Module\GameItems\Repositorys\ItemRecipeRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -32,7 +32,7 @@ class RecipeController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemRecipe(), function (Grid $grid) {
+        return Grid::make(new ItemRecipeRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             $helper->columnId();
             $grid->column('name', '配方名称');
@@ -74,7 +74,7 @@ class RecipeController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->like('name', '配方名称');
                 $filter->equal('result_item_id', '产出物品')->select(
-                    ItemItem::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
                 $filter->equal('is_visible', '是否可见')->radio([
                     1 => '是',
@@ -107,7 +107,7 @@ class RecipeController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemRecipe::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemRecipeRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             $helper->field('id', 'ID');
             $helper->field('name', '配方名称');
@@ -226,11 +226,11 @@ class RecipeController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemRecipe(), function (Form $form) {
+        return Form::make(new ItemRecipeRepository(), function (Form $form) {
             $helper = new FormHelper($form, $this);
             $helper->text('name', '配方名称')->required();
             $form->select('result_item_id', '产出物品')
-                ->options(ItemItem::pluck('name', 'id'))
+                ->options((new ItemRepository())->pluck('name', 'id'))
                 ->required();
             $form->number('result_quantity', '产出数量')
                 ->default(1)
@@ -260,7 +260,7 @@ class RecipeController extends AdminController
             // 配方材料
             $form->hasMany('materials', '配方材料', function (Form\NestedForm $form) {
                 $form->select('item_id', '物品')
-                    ->options(ItemItem::pluck('name', 'id'))
+                    ->options((new ItemRepository())->pluck('name', 'id'))
                     ->required();
                 $form->number('quantity', '数量')
                     ->default(1)

app/Module/GameItems/AdminControllers/TransactionLogController.php

@@ -3,8 +3,8 @@
 namespace App\Module\GameItems\AdminControllers;
 
 use App\Module\GameItems\Enums\TRANSACTION_TYPE;
-use App\Module\GameItems\Models\ItemTransactionLog;
-use App\Module\GameItems\Models\Item as ItemItem;
+use App\Module\GameItems\Repositorys\ItemTransactionLogRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use UCore\DcatAdmin\AdminController;
@@ -38,7 +38,7 @@ class TransactionLogController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemTransactionLog(), function (Grid $grid) {
+        return Grid::make(new ItemTransactionLogRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             
             // 禁用创建、编辑和删除按钮
@@ -75,7 +75,7 @@ class TransactionLogController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
                 $filter->equal('item_id', '物品')->select(
-                    ItemItem::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
                 $helper->equal('instance_id', '实例ID');
                 $filter->equal('transaction_type', '交易类型')->select(TRANSACTION_TYPE::all());
@@ -109,7 +109,7 @@ class TransactionLogController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemTransactionLog::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemTransactionLogRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             
             // 禁用编辑和删除按钮

app/Module/GameItems/AdminControllers/UserItemController.php

@@ -2,9 +2,9 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemUser;
-use App\Module\GameItems\Models\Item;
-use App\Module\GameItems\Models\ItemInstance;
+use App\Module\GameItems\Repositorys\ItemUserRepository;
+use App\Module\GameItems\Repositorys\ItemRepository;
+use App\Module\GameItems\Repositorys\ItemInstanceRepository;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
@@ -33,7 +33,7 @@ class UserItemController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemUser(), function (Grid $grid) {
+        return Grid::make(new ItemUserRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             $helper->columnId();
             $grid->column('user_id', '用户ID');
@@ -50,7 +50,7 @@ class UserItemController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
                 $filter->equal('item_id', '物品')->select(
-                    Item::pluck('name', 'id')
+                    (new ItemRepository())->pluck('name', 'id')
                 );
                 $helper->equal('instance_id', '实例ID');
                 $helper->between('quantity', '数量');
@@ -82,7 +82,7 @@ class UserItemController extends AdminController
      */
     protected function detail($id)
     {
-        $model = ItemUser::findOrFail($id);
+        $model = (new ItemUserRepository())->findOrFail($id);
 
         return Show::make($model, function (Show $show) {
             $helper = new ShowHelper($show, $this);
@@ -226,7 +226,7 @@ class UserItemController extends AdminController
      */
     protected function form()
     {
-        return Form::make(new ItemUser(), function (Form $form) {
+        return Form::make(new ItemUserRepository(), function (Form $form) {
             $helper = new FormHelper($form, $this);
             $helper->text('user_id', '用户ID')
                 ->required()
@@ -238,7 +238,7 @@ class UserItemController extends AdminController
                 ->default('normal')
                 ->when('normal', function (Form $form) {
                     $form->select('item_id', '物品')
-                        ->options(Item::pluck('name', 'id'))
+                        ->options((new ItemRepository())->pluck('name', 'id'))
                         ->required();
                     $form->number('quantity', '数量')
                         ->default(1)
@@ -247,12 +247,12 @@ class UserItemController extends AdminController
                 })
                 ->when('unique', function (Form $form) {
                     $form->select('item_id', '物品')
-                        ->options(Item::where('is_unique', 1)->pluck('name', 'id'))
+                        ->options((new ItemRepository())->where('is_unique', 1)->pluck('name', 'id'))
                         ->required();
                     $form->select('instance_id', '物品实例')
                         ->options(function ($id) {
                             if ($id) {
-                                $instance = ItemInstance::find($id);
+                                $instance = (new ItemInstanceRepository())->find($id);
                                 if ($instance) {
                                     return [$instance->id => $instance->name . ' (ID: ' . $instance->id . ')'];
                                 }

app/Module/GameItems/AdminControllers/UserOutputCounterController.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemUserOutputCounter;
-use App\Module\GameItems\Models\ItemOutputLimit;
+use App\Module\GameItems\Repositorys\ItemUserOutputCounterRepository;
+use App\Module\GameItems\Repositorys\ItemOutputLimitRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Layout\Content;
@@ -37,7 +37,7 @@ class UserOutputCounterController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemUserOutputCounter(), function (Grid $grid) {
+        return Grid::make(new ItemUserOutputCounterRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             
             // 禁用创建、编辑和删除按钮
@@ -68,7 +68,7 @@ class UserOutputCounterController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
                 $filter->equal('limit_id', '限制ID')->select(
-                    ItemOutputLimit::with('item')->get()->pluck('item.name', 'id')
+                    (new ItemOutputLimitRepository())->with('item')->get()->pluck('item.name', 'id')
                 );
                 $helper->between('current_count', '当前计数');
                 $helper->between('last_reset_time', '上次重置时间')->datetime();
@@ -99,7 +99,7 @@ class UserOutputCounterController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemUserOutputCounter::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemUserOutputCounterRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             
             // 禁用编辑和删除按钮

app/Module/GameItems/AdminControllers/UserRecipeController.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\GameItems\AdminControllers;
 
-use App\Module\GameItems\Models\ItemUserRecipe;
-use App\Module\GameItems\Models\ItemRecipe;
+use App\Module\GameItems\Repositorys\ItemUserRecipeRepository;
+use App\Module\GameItems\Repositorys\ItemRecipeRepository;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Layout\Content;
@@ -37,7 +37,7 @@ class UserRecipeController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ItemUserRecipe(), function (Grid $grid) {
+        return Grid::make(new ItemUserRecipeRepository(), function (Grid $grid) {
             $helper = new GridHelper($grid, $this);
             
             // 禁用创建、编辑和删除按钮
@@ -70,7 +70,7 @@ class UserRecipeController extends AdminController
                 $helper->equal('id', 'ID');
                 $helper->equal('user_id', '用户ID');
                 $filter->equal('recipe_id', '配方')->select(
-                    ItemRecipe::pluck('name', 'id')
+                    (new ItemRecipeRepository())->pluck('name', 'id')
                 );
                 $filter->equal('is_unlocked', '是否解锁')->radio([
                     1 => '是',
@@ -106,7 +106,7 @@ class UserRecipeController extends AdminController
      */
     protected function detail($id)
     {
-        return Show::make(ItemUserRecipe::findOrFail($id), function (Show $show) {
+        return Show::make((new ItemUserRecipeRepository())->findOrFail($id), function (Show $show) {
             $helper = new ShowHelper($show, $this);
             
             // 禁用编辑和删除按钮

app/Module/GameItems/Databases/create.sql

@@ -24,7 +24,6 @@ CREATE TABLE `kku_item_items` (
   `category_id` int NOT NULL COMMENT '物品分类ID，外键关联kku_item_categories表',
   `type` tinyint NOT NULL COMMENT '物品类型（1:可使用, 2:可装备, 3:可合成, 4:可交任务, 5:可开启...）',
   `is_unique` tinyint DEFAULT '0' COMMENT '是否是单独属性物品（0:否，默认, 1:是）',
-  `rarity` tinyint DEFAULT '1' COMMENT '稀有度（1:普通, 2:稀有, 3:史诗, 4:传说...）',
   `icon` varchar(255) DEFAULT NULL COMMENT '物品图标路径',
   `max_stack` int DEFAULT '1' COMMENT '最大堆叠数量',
   `sell_price` int DEFAULT '0' COMMENT '出售价格',

app/Module/GameItems/Enums/ITEM_RARITY.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Module\GameItems\Enums;
-
-/**
- * 物品稀有度枚举
- */
-class ITEM_RARITY
-{
-    /**
-     * 普通
-     */
-    const COMMON = 1;
-
-    /**
-     * 稀有
-     */
-    const RARE = 2;
-
-    /**
-     * 史诗
-     */
-    const EPIC = 3;
-
-    /**
-     * 传说
-     */
-    const LEGENDARY = 4;
-
-    /**
-     * 获取所有稀有度
-     *
-     * @return array
-     */
-    public static function all(): array
-    {
-        return [
-            self::COMMON => '普通',
-            self::RARE => '稀有',
-            self::EPIC => '史诗',
-            self::LEGENDARY => '传说',
-        ];
-    }
-
-    /**
-     * 获取稀有度名称
-     *
-     * @param int $rarity
-     * @return string
-     */
-    public static function getName(int $rarity): string
-    {
-        return self::all()[$rarity] ?? '未知稀有度';
-    }
-
-    /**
-     * 获取稀有度颜色
-     *
-     * @param int $rarity
-     * @return string
-     */
-    public static function getColor(int $rarity): string
-    {
-        $colors = [
-            self::COMMON => '#FFFFFF',    // 白色
-            self::RARE => '#0070DD',      // 蓝色
-            self::EPIC => '#A335EE',      // 紫色
-            self::LEGENDARY => '#FF8000', // 橙色
-        ];
-
-        return $colors[$rarity] ?? '#CCCCCC';
-    }
-}

app/Module/GameItems/Models/Item.php

@@ -2,6 +2,7 @@
 
 namespace App\Module\GameItems\Models;
 
+use App\Module\GameItems\Enums\ITEM_TYPE;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use UCore\ModelCore;
@@ -16,7 +17,6 @@ use UCore\ModelCore;
  * @property   int  $category_id  物品分类ID，外键关联kku_item_categories表
  * @property   int  $type  物品类型（1:可使用, 2:可装备, 3:可合成, 4:可交任务, 5:可开启...）
  * @property   int  $is_unique  是否是单独属性物品（0:否，默认, 1:是）
- * @property   int  $rarity  稀有度（1:普通, 2:稀有, 3:史诗, 4:传说...）
  * @property   string  $icon  物品图标路径
  * @property   int  $max_stack  最大堆叠数量
  * @property   int  $sell_price  出售价格
@@ -32,6 +32,7 @@ use UCore\ModelCore;
  */
 class Item extends ModelCore
 {
+
     /**
      * 与模型关联的表名
      *
@@ -47,7 +48,6 @@ class Item extends ModelCore
         'category_id',
         'type',
         'is_unique',
-        'rarity',
         'icon',
         'max_stack',
         'sell_price',
@@ -79,9 +79,10 @@ class Item extends ModelCore
     protected $casts = [
         'display_attributes' => \App\Module\GameItems\Casts\DisplayAttributesCast::class,
         'numeric_attributes' => \App\Module\GameItems\Casts\NumericAttributesCast::class,
-        'is_unique' => 'boolean',
-        'tradable' => 'boolean',
-        'dismantlable' => 'boolean',
+        'type'               => ITEM_TYPE::class,
+        'is_unique'          => 'boolean',
+        'tradable'           => 'boolean',
+        'dismantlable'       => 'boolean',
     ];
 
     /**
@@ -151,4 +152,5 @@ class Item extends ModelCore
 
         return $this->global_expire_at->isPast();
     }
+
 }

app/Module/GameItems/README.md

@@ -124,7 +124,6 @@ GameItems模块是游戏核心系统之一，负责管理游戏内所有物品
 | category_id | int | 物品分类ID，外键关联item_categories表 |
 | type | tinyint | 物品类型（1:可使用, 2:可装备, 3:可合成, 4:可交任务, 5:可开启...） |
 | is_unique | tinyint | 是否是单独属性物品（0:否，默认, 1:是） |
-| rarity | tinyint | 稀有度（1:普通, 2:稀有, 3:史诗, 4:传说...） |
 | icon | varchar | 物品图标路径 |
 | max_stack | int | 最大堆叠数量 |
 | sell_price | int | 出售价格 |

app/Module/GameItems/Services/ChestService.php

@@ -414,7 +414,6 @@ class ChestService
                         'item_id' => $groupItem->item_id,
                         'item_name' => $groupItem->item->name,
                         'item_icon' => $groupItem->item->icon,
-                        'item_rarity' => $groupItem->item->rarity,
                         'group_probability' => $groupItemProbability,
                         'combined_probability' => $combinedProbability,
                     ];
@@ -441,7 +440,6 @@ class ChestService
                     'item_id' => $item->id,
                     'item_name' => $item->name,
                     'item_icon' => $item->icon,
-                    'item_rarity' => $item->rarity,
                     'min_quantity' => $content->min_quantity,
                     'max_quantity' => $content->max_quantity,
                     'probability' => $probability,

noai.md

@@ -41,3 +41,5 @@ netresearch/jsonmapper
 参考app/Module/Fund/Repositorys/FundAdminRepository.php ，为 物品模块 的所有模型创建数据仓库
 
 参考 app/Module/Fund/GameItems/AdminControllers/ItemController.php ，修复物品模块后台其他控制器，不应使用模型，应该使用数据仓库
+
+Show::make 正确的使用方式`Show::make($id, new FundRepository(), function (Show $show) {`