gx

@@ -22,7 +22,7 @@ class AiCommandController extends BaseController
      * @method
      */
     public function lists(AiCommandModel $aiCommandModel){
-        $lists = $aiCommandModel->lists($this->map);
+        $lists = $aiCommandModel->lists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
     }
 
@@ -75,8 +75,8 @@ class AiCommandController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(Request $request,AiCommandLogic $aiCommandLogic){
-        $request->validate([
+    public function del(AiCommandLogic $aiCommandLogic){
+        $this->request->validate([
             'id'=>'required'
         ],[
             'id.required' => 'ID不能为空'

+<?php
+
+namespace App\Http\Controllers\Aside\Ai;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Ai\AiLog as AiLogModel;
+
+
+class AiLogController extends BaseController
+{
+    /**
+     * @name :ai日志列表
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function lists(AiLogModel $aiLogModel){
+        $lists = $aiLogModel->lists($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+}

@@ -34,8 +34,10 @@ class BaseController extends Controller
             $info = Cache::get($this->token);
             $this->user = $info;
             $this->uid = $info['id'];
+            //参数处理
+            $this->get_param();
         }
-        $this->get_param();
+
     }
 
 

 <?php
 
-namespace App\Http\Controllers\Aside;
+namespace App\Http\Controllers\Aside\Mail;
 
 use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Mail\MailLogic;
+use App\Http\Requests\Aside\Mail\MailRequest;
 use App\Models\Mail\Mail as MailModel;
 
 /**
@@ -17,13 +20,32 @@ class MailController extends BaseController
     }
 
     /**
-     * @name :添加站内信
+     * @name :详情
      * @return void
      * @author :liyuhang
      * @method
      */
-    public function add(){
+    public function info(MailLogic $mailLogic){
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $info = $mailLogic->mail_info();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
 
+    /**
+     * @name :添加站内信
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function add(MailRequest $mailRequest,MailLogic $mailLogic){
+        $mailRequest->validated();
+        $mailLogic->mail_add();
+        $this->response('success');
     }
 
     /**
@@ -32,16 +54,29 @@ class MailController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function edit(){
-
+    public function edit(MailRequest $mailRequest,MailLogic $mailLogic){
+        $mailRequest->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $mailLogic->mail_edit();
+        $this->response('success');
     }
+
     /**
      * @name :逻辑删除站内信
      * @return void
      * @author :liyuhang
      * @method
      */
-    public function del(){
-
+    public function del(MailLogic $mailLogic){
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $mailLogic->mail_del();
+        $this->response('success');
     }
 }

@@ -2,14 +2,17 @@
 
 namespace App\Http\Controllers\Aside\User;
 
+use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
+use App\Models\ProjectGroup as ProjectGroupModel;
 
 class ProjectGroupController extends BaseController
 {
     /**
      * @name:用户组列表
      */
-    public function lists(){
-
+    public function lists(ProjectGroupModel $projectGroupModel){
+        $lists = $projectGroupModel->lists($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$lists);
     }
 }

 <?php
 
-namespace App\Http\Controllers\Bside;
+namespace App\Http\Controllers\Bside\Ai;
 
 use App\Enums\Common\Code;
 use App\Helper\Common;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Controllers\Bside\：写入日志;
 use App\Models\Ai\AiLog;
-use Illuminate\Http\Request;
 
 class AiCommandController extends BaseController
 {

@@ -40,7 +40,6 @@ class BaseController extends Controller
             //日志记录
             $this->set_user_log();
         }
-
     }
 
     /**
@@ -163,7 +162,7 @@ class BaseController extends Controller
                         break;
                     case 'operator_id':
                         if(!empty($v)){
-                            $name = $this->get_name(['operator_id'=>$v]);
+                            $name = (new UserModel())->read(['operator_id'=>$v],['id','name']);
                             $data['operator_name'] = (isset($name['name']) && !empty($name['name'])) ? $name['name'] : '无名称';
                         }
                         break;
@@ -172,17 +171,7 @@ class BaseController extends Controller
         }
         return $data;
     }
-    /**
-     * @name :获取操作人名称
-     * @return void
-     * @author :liyuhang
-     * @method
-     */
-    public function get_name($data){
-        $user = new UserModel();
-        $info = $user->read($data,['id','name']);
-        return $info;
-    }
+
     /**
      * @name :写入操作日志
      * @return void

 <?php
 
-namespace App\Http\Controllers\Bside;
+namespace App\Http\Controllers\Bside\Mail;
 
 use App\Enums\Common\Code;
-use App\Http\Logic\Bside\MailLogic;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Mail\MailLogic;
 use App\Models\Mail\Mail as MailModel;
 use App\Models\Mail\MailUser as MailUserModel;
-use Illuminate\Http\Request;
 
 class MailController extends BaseController
 {

@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Bside\User;
 
 use App\Helper\Arr;
 use App\Http\Controllers\Bside\BaseController;
-use App\Http\Logic\Bside\DeptLogic;
-use App\Http\Requests\Bside\DeptRequest;
+use App\Http\Logic\Bside\User\DeptLogic;
+use App\Http\Requests\Bside\User\DeptRequest;
 use App\Rules\Ids;
 use Illuminate\Http\Request;
 

@@ -63,7 +63,7 @@ class AiCommandLogic extends BaseLogic
         ];
         $info = $this->model->read($condition);
         if($info !== false){
-            $this->fail('当前编辑的已存在');
+            $this->fail('当前编辑的指令key已存在');
         }
         $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){

+<?php
+
+namespace App\Http\Logic\Aside\Mail;
+
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Mail\Mail as MailModel;
+
+class MailLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new MailModel();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @name :获取详情
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function mail_info(){
+        $info = $this->model->read($this->param);
+        if($info === false){
+            $this->fail('当前数据不存在');
+        }
+        return $this->success($info);
+    }
+    /**
+     * @name :添加会员
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function mail_add(){
+        $rs = $this->model->add($this->param);
+        if($rs === false){
+            $this->fail('添加失败');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @name :编辑会员
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function mail_edit(){
+        $rs = $this->model->edit($this->param);
+        if($rs === false){
+            $this->fail('编辑失败');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @name :删除会员
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function mail_del(){
+        $this->param['id'] = ['in',$this->param['id']];
+        $rs = $this->model->del($this->param);
+        if($rs === false){
+            $this->fail('删除失败');
+        }
+        return $this->success();
+    }
+}

 <?php
 
-namespace App\Http\Logic\Bside;
+namespace App\Http\Logic\Bside\Mail;
 
 use App\Enums\Common\Code;
+use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Mail\Mail as MailModel;
 use App\Models\Mail\MailUser as MailUserModel;
 

 <?php
 
-namespace App\Http\Logic\Bside;
+namespace App\Http\Logic\Bside\User;
 
 use App\Helper\Arr;
+use App\Http\Logic\Bside\BaseLogic;
 use App\Models\ProjectDept;
 
 /**

 <?php
 
-namespace App\Http\Logic\Bside;
+namespace App\Http\Logic\Bside\User;
 
+use App\Http\Logic\Bside\BaseLogic;
 use App\Models\ProjectGroup;
 
 class GroupLogic extends BaseLogic

@@ -33,9 +33,9 @@ class AiCommandRequest extends FormRequest
     public function messages()
     {
         return [
-            'key.required'=>'指令不能为空',
+            'key.required'=>'key不能为空',
             'scene.required'   =>  '场景不能为空',
-            'ai.required'=>'指令不猛为空',
+            'ai.required'=>'指令你能为空',
         ];
     }
 }

+<?php
+
+namespace App\Http\Requests\Aside\Mail;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class MailRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'title'=>'required',
+            'content'=>'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'title.required'=>'名称不能为空',
+            'content.required'   =>  '内容不能为空',
+        ];
+    }
+}

 <?php
 
-namespace App\Http\Requests\Bside;
+namespace App\Http\Requests\Bside\User;
 
 use Illuminate\Foundation\Http\FormRequest;
 

@@ -69,7 +69,7 @@ class Base extends Model
     public function lists($map, $page, $row, $order = 'id', $fields = ['*']): array
     {
         $query = $this->formatQuery($map);
-        $lists = $query->select($fields)->orderBy($order)->paginate($row, ['*'], 'page', $page);
+        $lists = $query->select($fields)->orderBy($order,'desc')->paginate($row, ['*'], 'page', $page);
         if (empty($lists)) {
             return [];
         }

@@ -106,6 +106,7 @@ return [
     */
 
     'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+    //是否写入缓存
     'user_is_cache' =>[
         'is_cache' => false,
     ],

@@ -26,8 +26,8 @@ Route::middleware(['bloginauth'])->group(function () {
 
     //站内信
     Route::prefix('mail')->group(function () {
-        Route::any('/', [\App\Http\Controllers\Bside\MailController::class, 'lists'])->name('mail_lists');
-        Route::any('/info', [\App\Http\Controllers\Bside\MailController::class, 'info'])->name('mail_info');
+        Route::any('/', [\App\Http\Controllers\Bside\Mail\MailController::class, 'lists'])->name('mail_lists');
+        Route::any('/info', [\App\Http\Controllers\Bside\Mail\MailController::class, 'info'])->name('mail_info');
     });
 
     //用户角色相关路由
@@ -104,7 +104,7 @@ Route::middleware(['bloginauth'])->group(function () {
     //ai指令
     Route::prefix('command')->group(function () {
         //公用ai自动生成
-        Route::any('/ai_http_post', [\App\Http\Controllers\Bside\AiCommandController::class, 'ai_http_post'])->name('ai_http_post');
+        Route::any('/ai_http_post', [\App\Http\Controllers\Bside\Ai\AiCommandController::class, 'ai_http_post'])->name('ai_http_post');
     });
 
     //产品