1

.roo/rules-orchestrator/rules.md

@@ -0,0 +1 @@
+- 项目是多模块的,模块化架构

app/Module/Dev/AdminControllers/DevController.php

@@ -3,31 +3,20 @@
 namespace App\Module\Dev\AdminControllers;
 
 
-
 use App\Module\System\Repositories\Route;
-use App\Module\System\Repositories\RouteName;
 use App\Http\Controllers\Controller;
-
-
-
-
 use App\Module\Ulogic\Enum\RULE;
-
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
-
 use Spatie\RouteAttributes\Attributes\Get;
 use Spatie\RouteAttributes\Attributes\Post;
 use UCore\DcatAdmin\Widgets\Iframe;
 
-
 /**
  * 开发常用
  */
 class DevController extends Controller
 {
-
-
     public function index(Content $content)
     {
         return $content
@@ -37,19 +26,14 @@ class DevController extends Controller
 
     public function index2()
     {
-
         dump('config-wechat', config('wechat'));
         dump('config-wechat-pay', config('wechat_pay'));
 
         dump('SERVER', $_SERVER);
         dump('ENV', $_ENV);
         dump('REQUEST', $_REQUEST);
-//        dump('REQUEST',$);
-
     }
 
-
-
     public function info()
     {
         $content = '';
@@ -90,47 +74,27 @@ class DevController extends Controller
         return $content->row($this->trace_fom())->row(view('admin_core.dev.info'));
     }
 
-
     public function trace_fom()
     {
         return '  表单';
     }
 
-
-    /**
-     * 路由列表.name
-     *
-     * @param Content $content
-     * @return Content
-     */
     #[Get('dev/router')]
     public function router(Content $content)
     {
-
         return $content
             ->title('路由.name')
             ->body($this->router_names());
-
-
     }
 
     public function router_names()
     {
-        /**
-         *   "middleware" => array:3 [▶]
-         * "uses" => "Dcat\Admin\Http\Controllers\HandleFormController@handle"
-         * "controller" => "Dcat\Admin\Http\Controllers\HandleFormController@handle"
-         * "as" => "dcat.admin.dcat-api.form"
-         * "namespace" => "Dcat\Admin\Http\Controllers"
-         * "prefix" => "/admin/dcat-api"
-         * "where" => []
-         */
-        return Grid::make(new RouteName(), function (Grid $grid) {
+        $route = new Route();
+        return Grid::make($route->getNamedRoutes(), function (Grid $grid) {
             $grid->column('as');
             $grid->column('namespace');
             $grid->column('controller');
             $grid->column('uses');
-//            dump($grid)
             $grid->disableActions(true);
             $grid->disableBatchActions(true);
             $grid->disableToolbar(true);
@@ -138,33 +102,21 @@ class DevController extends Controller
         });
     }
 
-
-    /**
-     * 路由列表
-     *
-     * @param Content $content
-     * @return Content
-     */
     #[Get('dev/router_all')]
     public function router_all(Content $content)
     {
-
         return $content
             ->title('路由')
             ->body($this->router_all2());
-
-
     }
 
     public function router_all2()
     {
-
         return Grid::make(new Route(), function (Grid $grid) {
             $grid->column('as');
             $grid->column('namespace');
             $grid->column('controller');
             $grid->column('uses');
-//            dump($grid)
             $grid->disableActions(true);
             $grid->disableBatchActions(true);
             $grid->disableToolbar(true);
@@ -172,12 +124,6 @@ class DevController extends Controller
         });
     }
 
-
-    /**
-     * 枚举列表
-     *
-     * @return false|string
-     */
     #[Post('index/enums')]
     public function enums()
     {
@@ -205,9 +151,6 @@ class DevController extends Controller
 
         $data['FundLogType'] = \App\Module\Fund\Enums\LOG_TYPE::getValueDescription();
 
-
         dump($data);
     }
-
-
 }

app/Module/Dev/AdminControllers/LogsController.php

@@ -5,13 +5,10 @@ namespace App\Module\Dev\AdminControllers;
 use App\Http\Controllers\Controller;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
+use App\Module\System\Repositories\Logs;
 
 class LogsController extends Controller
 {
-
-
-
-
     public function index(Content $content)
     {
         return $content
@@ -32,8 +29,6 @@ class LogsController extends Controller
             ->body($this->logsCron());
     }
 
-
-
     public function logs()
     {
         return Grid::make(new Logs(), function (Grid $grid) {
@@ -49,7 +44,8 @@ class LogsController extends Controller
 
     public function logs2()
     {
-        return Grid::make(new Logs2(), function (Grid $grid) {
+        $logs = new Logs();
+        return Grid::make($logs->getCliLogs(), function (Grid $grid) {
             $grid->column('id')->sortable();
             $grid->column('content');
 
@@ -62,7 +58,8 @@ class LogsController extends Controller
 
     public function logsCron()
     {
-        return Grid::make(new LogsCron(), function (Grid $grid) {
+        $logs = new Logs();
+        return Grid::make($logs->getCronLogs(), function (Grid $grid) {
             $grid->column('id')->sortable();
             $grid->column('content');
 
@@ -72,5 +69,4 @@ class LogsController extends Controller
             $grid->disablePagination();
         });
     }
-
 }

app/Module/System/Repositories/Logs.php

@@ -14,6 +14,22 @@ use Monolog\Handler\StreamHandler;
  */
 class Logs extends Repository
 {
+    /**
+     * 合并LogsCron功能 - 读取定时任务日志
+     */
+    public function getCronLogs()
+    {
+        $path = storage_path('logs/cron.log');
+        return self::read($path);
+    }
+    /**
+     * 合并Logs2功能 - 读取CLI日志
+     */
+    public function getCliLogs()
+    {
+        $path = storage_path('logs/cli.log');
+        return self::read($path);
+    }
 
     public function get(Grid\Model $model)
     {

app/Module/System/Repositories/Logs2.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Module\System\Repositories;
-
-
-use Dcat\Admin\Grid;
-use Dcat\Admin\Repositories\Repository;
-
-/**
- * 日志读取
- *
- */
-class Logs2 extends Repository
-{
-
-    public function get(Grid\Model $model)
-    {
-        $list = [];
-        $path = storage_path('logs/cli.log');
-        $list  = Logs::read($path);
-
-
-
-        return $list;
-    }
-
-
-}

app/Module/System/Repositories/LogsCron.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Module\System\Repositories;
-
-
-use Dcat\Admin\Grid;
-use Dcat\Admin\Repositories\Repository;
-use Illuminate\Support\Facades\Log;
-use Monolog\Handler\StreamHandler;
-
-/**
- * 日志读取 Cron
- *
- */
-class LogsCron extends Repository
-{
-
-    public function get(Grid\Model $model)
-    {
-        $list = [];
-        $path = storage_path('logs/cron.log');
-        $list  = Logs::read($path);
-
-
-
-        return $list;
-    }
-
-
-}

app/Module/System/Repositories/Route.php

@@ -14,6 +14,18 @@ use Monolog\Handler\StreamHandler;
  */
 class Route extends Repository
 {
+    /**
+     * 合并RouteName功能 - 获取命名路由
+     */
+    public function getNamedRoutes()
+    {
+        $list = [];
+        $routes = \Illuminate\Support\Facades\Route::getRoutes();
+        foreach ($routes->getRoutesByName() as $route) {
+            $list[] = $route->action;
+        }
+        return $list;
+    }
 
     public function get(Grid\Model $model)
     {

app/Module/System/Repositories/RouteName.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Module\System\Repositories;
-
-
-use Dcat\Admin\Grid;
-use Dcat\Admin\Repositories\Repository;
-use Illuminate\Support\Facades\Log;
-use Monolog\Handler\StreamHandler;
-
-/**
- * 路由 名字
- *
- */
-class RouteName extends Repository
-{
-
-    public function get(Grid\Model $model)
-    {
-        $list = [];
-
-
-        $routes = \Illuminate\Support\Facades\Route::getRoutes();
-        foreach ($routes->getRoutesByName() as $route) {
-//            dump($route->action);
-            $list[] = $route->action;
-        }
-        return $list;
-    }
-
-
-}

app/Module/System/Repositories/SysConfigRepositories.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Module\System\Repositories;
-
-use App\Module\System\Models\SysConfig;
-use Dcat\Admin\Repositories\EloquentRepository;
-
-class SysConfigRepositories extends EloquentRepository
-{
-    /**
-     * Model.
-     *
-     * @var string
-     */
-    protected $eloquentClass = SysConfig::class;
-
-    /**
-     * 获取分组数据
-     * @return array
-     */
-    public function getGroup(): array
-    {
-        return SysConfig::query()->distinct()->pluck('group', 'group')->toArray();
-    }
-}

noai.md

@@ -68,4 +68,4 @@ AppGame模块，增加登陆成功事件
 在任务获取是，根据 task_user_tasks  
 
 
-数据仓库（Repository）里不应该有任何方法，修复已创建的所有数据仓库，注意检查已经定义的方法是否被使用，如果没有使用，删除该方法
+app/Module下 数据仓库（Repository）里不应该有任何方法，修复已创建的所有数据仓库，注意检查已经定义的方法是否被使用，如果没有使用，删除该方法