2

UCore/DcatAdmin/ActionLog/BaseLog.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace UCore\DcatAdmin\ActionLog;
-
-use App\Module\System\Models\AdminActionlog;
-
-
-abstract class BaseLog implements InterfaceLog
-{
-
-    public $objectClass;
-    public $admin_id;
-    public $before;
-    public $after;
-    public $url;
-    public $unid   = RUN_UNIQID;
-    public $status = 0;
-    public $p1 = null;
-
-    public function __destruct()
-    {
-
-        $model               = new AdminActionlog();
-        $model->object_class = $this->objectClass;
-        $model->admin_id     = $this->admin_id;
-        $model->before       = $this->before??[];
-        if(!$this->after){
-            $this->after = 'is null or empty ';
-        }
-        $model->after        = $this->after;
-        $model->url          = $this->url;
-        $model->unid         = $this->unid;
-        $model->type1        = static::TYPE;
-        $model->status       = $this->status;
-        $model->p1        = serialize($this->p1);
-
-        $model->save();
-
-    }
-
-}

app/Module/File/Repositories/FileRepository.php

@@ -1,126 +0,0 @@
-<?php
-
-namespace App\Module\File\Repositories;
-
-use App\Module\File\Models\FileFile;
-use App\Module\File\Models\FileImg;
-use App\Module\File\Models\FileTemplate;
-
-/**
- * 文件仓库类
- * 
- * 提供文件数据的访问和操作
- */
-class FileRepository
-{
-    /**
-     * 根据ID获取文件
-     *
-     * @param int $id 文件ID
-     * @return FileFile|null 文件模型
-     */
-    public function getFileById(int $id)
-    {
-        return FileFile::find($id);
-    }
-
-    /**
-     * 根据ID获取图片
-     *
-     * @param int $id 图片ID
-     * @return FileImg|null 图片模型
-     */
-    public function getImageById(int $id)
-    {
-        return FileImg::find($id);
-    }
-
-    /**
-     * 根据ID获取模板
-     *
-     * @param int $id 模板ID
-     * @return FileTemplate|null 模板模型
-     */
-    public function getTemplateById(int $id)
-    {
-        return FileTemplate::find($id);
-    }
-
-    /**
-     * 根据标识获取模板
-     *
-     * @param string $unid 模板标识
-     * @return FileTemplate|null 模板模型
-     */
-    public function getTemplateByUnid(string $unid)
-    {
-        return FileTemplate::where('unid', $unid)->first();
-    }
-
-    /**
-     * 获取用户的图片列表
-     *
-     * @param int $userId 用户ID
-     * @param int $page 页码
-     * @param int $pageSize 每页数量
-     * @return \Illuminate\Pagination\LengthAwarePaginator 分页结果
-     */
-    public function getUserImages(int $userId, int $page = 1, int $pageSize = 20)
-    {
-        return FileImg::where('user_id', $userId)
-            ->orderBy('id', 'desc')
-            ->paginate($pageSize, ['*'], 'page', $page);
-    }
-
-    /**
-     * 获取关联的图片列表
-     *
-     * @param string $reType 关联类型
-     * @param int $reId 关联ID
-     * @return \Illuminate\Database\Eloquent\Collection 图片集合
-     */
-    public function getRelatedImages(string $reType, int $reId)
-    {
-        return FileImg::where('re_type', $reType)
-            ->where('re_id', $reId)
-            ->orderBy('id', 'desc')
-            ->get();
-    }
-
-    /**
-     * 获取关联的文件列表
-     *
-     * @param string $reType 关联类型
-     * @param int $reId 关联ID
-     * @return \Illuminate\Database\Eloquent\Collection 文件集合
-     */
-    public function getRelatedFiles(string $reType, int $reId)
-    {
-        return FileFile::where('re_type', $reType)
-            ->where('re_id', $reId)
-            ->orderBy('id', 'desc')
-            ->get();
-    }
-
-    /**
-     * 获取模板列表
-     *
-     * @param string $group 分组
-     * @param int $status 状态
-     * @return \Illuminate\Database\Eloquent\Collection 模板集合
-     */
-    public function getTemplates(string $group = '', int $status = FileTemplate::STATUS_1)
-    {
-        $query = FileTemplate::query();
-        
-        if (!empty($group)) {
-            $query->where('group', $group);
-        }
-        
-        if ($status !== null) {
-            $query->where('status', $status);
-        }
-        
-        return $query->orderBy('id', 'desc')->get();
-    }
-}

app/Module/File/Repositorys/FileRepository.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Module\File\Repositorys;
+
+use App\Module\File\Models\FileFile;
+use App\Module\File\Models\FileImg;
+use App\Module\File\Models\FileTemplate;
+
+/**
+ * 文件仓库类
+ * 
+ * 提供文件数据的访问和操作
+ */
+class FileRepository
+{
+}

app/Module/System/Repositories/Administrator.php

@@ -4,6 +4,9 @@ namespace App\Module\System\Repositories;
 
 
 
+/**
+ * @deprecated 已迁移至Repositorys目录
+ */
 class Administrator extends \Dcat\Admin\Http\Repositories\Administrator
 {
     public $eloquentClass = \App\Module\System\Models\Administrator::class;

app/Module/System/Repositories/AppConfig.php

@@ -7,6 +7,9 @@ use App\Module\System\Models\SysConfig;
 use UCore\DcatAdmin\Repository\EloquentRepository;
 
 
+/**
+ * @deprecated 已迁移至Repositorys目录
+ */
 class AppConfig extends EloquentRepository
 {
 

app/Module/System/Repositories/Logs.php

@@ -12,6 +12,9 @@ use Monolog\Handler\StreamHandler;
  * 日志读取
  *
  */
+/**
+ * @deprecated 已迁移至Repositorys目录
+ */
 class Logs extends Repository
 {
     /**

app/Module/System/Repositories/RequireLog.php

@@ -10,6 +10,9 @@ use UCore\Model\RequestLog;
  * 请求日志
  *
  */
+/**
+ * @deprecated 已迁移至Repositorys目录
+ */
 class RequireLog extends Eloquent9999999Repository
 {
 

app/Module/System/Repositories/Route.php

@@ -12,6 +12,9 @@ use Monolog\Handler\StreamHandler;
  * 所有的路由
  *
  */
+/**
+ * @deprecated 已迁移至Repositorys目录
+ */
 class Route extends Repository
 {
     /**

app/Module/System/Repositories/Trace.php

@@ -10,6 +10,9 @@ use Dcat\Admin\Repositories\Repository;
  * 日志读取
  *
  */
+/**
+ * @deprecated 已迁移至Repositorys目录
+ */
 class Trace extends Repository
 {
 

app/Module/System/Repositorys/Administrator.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Module\System\Repositorys;
+
+
+class Administrator extends \Dcat\Admin\Http\Repositories\Administrator
+{
+    public $eloquentClass = \App\Module\System\Models\Administrator::class;
+
+}

app/Module/System/Repositorys/AppConfig.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Module\System\Repositorys;
+
+
+use App\Module\System\Models\SysConfig;
+use UCore\DcatAdmin\Repository\EloquentRepository;
+
+
+class AppConfig extends EloquentRepository
+{
+
+
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = SysConfig::class;
+
+
+}

app/Module/System/Repositorys/Logs.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Module\System\Repositorys;
+
+use Dcat\Admin\Grid;
+use Dcat\Admin\Repositories\Repository;
+use Illuminate\Support\Facades\Log;
+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)
+    {
+        $list = [];
+        /**
+         * @var \Monolog\Logger $loger
+         */
+        $loger = Log::getLogger();
+        /**
+         * @var \Monolog\Handler\StreamHandler $handler
+         */
+        $handler = $loger->getHandlers()[0];
+        if ($handler instanceof StreamHandler) {
+            $file = $handler->getUrl();
+            $list = self::read($file,100);
+//            dump($list);
+        }
+
+
+        return $list;
+    }
+
+    static public function read($file, $lineNumber = 30)
+    {
+
+        $f = fopen($file, 'r');
+
+        $cursor = -1;
+
+        fseek($f, $cursor, SEEK_END);
+
+        $char = fgetc($f);
+
+        /**
+         * Trim trailing newline chars of the file
+         * 修剪文件的尾部换行符
+         */
+
+        while ($char === "\n" || $char === "\r") {
+
+            fseek($f, $cursor--, SEEK_END);
+
+            $char = fgetc($f);
+
+        }
+
+        $res = [];
+        foreach (range(0, $lineNumber) as $a) {
+            $line = '';
+
+            /**
+             * Read until the start of file or first newline char
+             * 读取到文件开头或第一个换行符
+             */
+
+            while ($char !== false && $char !== "\n" && $char !== "\r") {
+//                dump($char,$cursor);
+                /**
+                 * Prepend the new char
+                 * 前置新的char
+                 */
+                $line = $char . $line;
+
+                fseek($f, $cursor--, SEEK_END);
+
+                $char = fgetc($f);
+//                dump($char);
+
+            }
+//            $cursor--;
+            fseek($f, $cursor--, SEEK_END);
+            $char = fgetc($f);
+
+            $res[] = [
+                'id'      => $a,
+                'content' => $line
+            ];
+        }
+
+
+        return $res;
+    }
+
+}

app/Module/System/Repositorys/RequireLog.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Module\System\Repositorys;
+
+
+use UCore\DcatAdmin\Repository\Eloquent9999999Repository;
+use UCore\Model\RequestLog;
+
+/**
+ * 请求日志
+ *
+ */
+class RequireLog extends Eloquent9999999Repository
+{
+
+    /**
+     *
+     * @var string
+     */
+    protected $eloquentClass = RequestLog::class;
+
+
+
+}

app/Module/System/Repositorys/Route.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Module\System\Repositorys;
+
+use Dcat\Admin\Grid;
+use Dcat\Admin\Repositories\Repository;
+use Illuminate\Support\Facades\Log;
+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)
+    {
+        $list = [];
+
+
+        $routes = \Illuminate\Support\Facades\Route::getRoutes();
+        foreach ($routes->getRoutes() as $route) {
+            $list[] = $route->action;
+        }
+        return $list;
+    }
+
+
+}

app/Module/System/Repositorys/Trace.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Module\System\Repositorys;
+
+use Dcat\Admin\Grid;
+use Dcat\Admin\Repositories\Repository;
+
+/**
+ * 日志读取
+ *
+ */
+class Trace extends Repository
+{
+
+    public function get(Grid\Model $model)
+    {
+        $unid = null;
+        if($model->getQueries()->first()){
+            $unid = $model->getQueries()->first()['arguments'][1];
+        }
+        // dump($unid);
+
+        $list = $this->list1($unid);
+
+        return $list;
+    }
+
+
+    public function list1($unid = null)
+    {  $list = [];
+        if($unid){
+            $d= \UCore\Trace::getData($unid);
+            $arr    = [
+                'id'   => $unid,
+                'unid' => $d
+            ];
+            $list[] = $arr;
+            return $list;
+        }
+
+        $l    = \UCore\Trace::getlist();
+
+
+        foreach ($l as $k => $item) {
+            if ($unid) {
+                if ($item != $unid) {
+                    continue;
+                }
+            }
+            $arr    = [
+                'id'   => $k,
+                'unid' => $item
+            ];
+            $list[] = $arr;
+        }
+
+        return $list;
+
+    }
+
+}

app/Module/Task/Repositorys/TaskRepository.php

@@ -19,70 +19,4 @@ class TaskRepository extends EloquentRepository
      * @var string
      */
     protected $eloquentClass = Task::class;
-    
-    /**
-     * 复制任务
-     * 
-     * @param int $id 任务ID
-     * @return Task 复制后的新任务
-     */
-    public function duplicate(int $id): Task
-    {
-        $task = $this->eloquentClass::findOrFail($id);
-        $newTask = $task->replicate();
-        $newTask->name = $task->name . ' (复制)';
-        $newTask->save();
-        
-        // 复制任务奖励
-        foreach ($task->rewards as $reward) {
-            $newReward = $reward->replicate();
-            $newReward->task_id = $newTask->id;
-            $newReward->save();
-        }
-        
-        // 复制任务消耗
-        foreach ($task->costs as $cost) {
-            $newCost = $cost->replicate();
-            $newCost->task_id = $newTask->id;
-            $newCost->save();
-        }
-        
-        // 复制任务达成条件
-        foreach ($task->achievementConditions as $condition) {
-            $newCondition = $condition->replicate();
-            $newCondition->task_id = $newTask->id;
-            $newCondition->save();
-        }
-        
-        return $newTask;
-    }
-    
-    /**
-     * 获取可用任务列表
-     * 
-     * @param int $userId 用户ID
-     * @param string|null $type 任务类型
-     * @param int $userLevel 用户等级
-     * @return array 可用任务列表
-     */
-    public function getAvailableTasks(int $userId, ?string $type = null, int $userLevel = 0): array
-    {
-        $query = $this->eloquentClass::query()
-            ->where('is_active', true)
-            ->where('level_required', '<=', $userLevel)
-            ->where(function ($query) {
-                $query->whereNull('start_time')
-                    ->orWhere('start_time', '<=', now());
-            })
-            ->where(function ($query) {
-                $query->whereNull('end_time')
-                    ->orWhere('end_time', '>=', now());
-            });
-            
-        if ($type) {
-            $query->where('type', $type);
-        }
-        
-        return $query->get()->toArray();
-    }
 }

app/Module/Task/Repositorys/TaskRewardRepository.php

@@ -19,18 +19,4 @@ class TaskRewardRepository extends EloquentRepository
      * @var string
      */
     protected $eloquentClass = TaskReward::class;
-    
-    /**
-     * 获取指定任务的所有奖励
-     * 
-     * @param int $taskId 任务ID
-     * @return array 奖励列表
-     */
-    public function getRewardsByTaskId(int $taskId): array
-    {
-        return $this->eloquentClass::where('task_id', $taskId)
-            ->orderBy('sort_order', 'desc')
-            ->get()
-            ->toArray();
-    }
 }

app/Module/Task/Repositorys/TaskUserProgressRepository.php

@@ -19,36 +19,4 @@ class TaskUserProgressRepository extends EloquentRepository
      * @var string
      */
     protected $eloquentClass = TaskUserProgress::class;
-    
-    /**
-     * 获取用户特定任务的所有进度
-     * 
-     * @param int $userId 用户ID
-     * @param int $taskId 任务ID
-     * @return array 用户任务进度列表
-     */
-    public function getUserTaskProgress(int $userId, int $taskId): array
-    {
-        return $this->eloquentClass::where('user_id', $userId)
-            ->where('task_id', $taskId)
-            ->with(['achievementCondition', 'achievementCondition.condition'])
-            ->get()
-            ->toArray();
-    }
-    
-    /**
-     * 获取用户特定任务条件的进度
-     * 
-     * @param int $userId 用户ID
-     * @param int $taskId 任务ID
-     * @param int $conditionId 条件ID
-     * @return TaskUserProgress|null 用户任务进度对象
-     */
-    public function getUserTaskConditionProgress(int $userId, int $taskId, int $conditionId): ?TaskUserProgress
-    {
-        return $this->eloquentClass::where('user_id', $userId)
-            ->where('task_id', $taskId)
-            ->where('achievement_condition_id', $conditionId)
-            ->first();
-    }
 }

app/Module/User/Repository/UserAction.php

@@ -6,6 +6,7 @@ use App\Admin\Core\Repositories\EloquentRepository;
 
 
 /**
+ * @deprecated 已迁移至Repositorys目录
  *
  * 用户处理记录
  *

app/Module/User/Repository/UserInfo.php

@@ -5,6 +5,7 @@ namespace App\Module\User\Repository;
 use App\Admin\Core\Repositories\EloquentRepository;
 
 /**
+ * @deprecated 已迁移至Repositorys目录
  *
  * 用户信息
  *

app/Module/User/Repositorys/UserAction.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Module\User\Repositorys;
+
+use App\Admin\Core\Repositories\EloquentRepository;
+
+
+/**
+ *
+ * 用户处理记录
+ *
+ */
+class UserAction extends EloquentRepository
+{
+
+    protected $eloquentClass = \App\Module\User\Models\UserAction::class;
+
+}

app/Module/User/Repositorys/UserInfo.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Module\User\Repositorys;
+
+use App\Admin\Core\Repositories\EloquentRepository;
+
+/**
+ *
+ * 用户信息
+ *
+ */
+class UserInfo extends EloquentRepository
+{
+
+    protected $eloquentClass = \App\Module\User\Models\UserInfo::class;
+
+}

noai.md

@@ -69,3 +69,5 @@ AppGame模块，增加登陆成功事件
 
 
 app/Module下 数据仓库（Repository）里不应该有任何方法，修复已创建的所有数据仓库，注意检查已经定义的方法是否被使用，如果没有使用，删除该方法
+
+app/Module下 Repository 类,应该位于各模块的 Repositorys 目录,找出目录错误的,移动到正确的目录,并修复引用