正在显示
9 个修改的文件
包含
166 行增加
和
31 行删除
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | -namespace App\Http\Controllers\Aside; | 3 | +namespace App\Http\Controllers\Aside\Ai; |
| 4 | 4 | ||
| 5 | use App\Enums\Common\Code; | 5 | use App\Enums\Common\Code; |
| 6 | use App\Http\Controllers\Aside\BaseController; | 6 | use App\Http\Controllers\Aside\BaseController; |
| 7 | +use App\Http\Logic\Aside\Ai\AiCommandLogic; | ||
| 8 | +use App\Http\Requests\Aside\Ai\AiCommandRequest; | ||
| 7 | use App\Models\AiCommand as AiCommandModel; | 9 | use App\Models\AiCommand as AiCommandModel; |
| 10 | +use Illuminate\Http\Request; | ||
| 8 | use function App\Helper\send_openai_msg; | 11 | use function App\Helper\send_openai_msg; |
| 9 | 12 | ||
| 10 | /** | 13 | /** |
| @@ -24,13 +27,30 @@ class AiCommandController extends BaseController | @@ -24,13 +27,30 @@ class AiCommandController extends BaseController | ||
| 24 | } | 27 | } |
| 25 | 28 | ||
| 26 | /** | 29 | /** |
| 30 | + * @name :详情 | ||
| 31 | + * @return void | ||
| 32 | + * @author :liyuhang | ||
| 33 | + * @method | ||
| 34 | + */ | ||
| 35 | + public function info(Request $request,AiCommandLogic $aiCommandLogic){ | ||
| 36 | + $request->validate([ | ||
| 37 | + 'id'=>'required' | ||
| 38 | + ],[ | ||
| 39 | + 'id.required' => 'ID不能为空' | ||
| 40 | + ]); | ||
| 41 | + $aiCommandLogic->ai_info(); | ||
| 42 | + $this->response('success'); | ||
| 43 | + } | ||
| 44 | + /** | ||
| 27 | * @name | 45 | * @name |
| 28 | * @return void | 46 | * @return void |
| 29 | * @author :liyuhang | 47 | * @author :liyuhang |
| 30 | * @method | 48 | * @method |
| 31 | */ | 49 | */ |
| 32 | - public function add(){ | ||
| 33 | - | 50 | + public function add(AiCommandRequest $request,AiCommandLogic $aiCommandLogic){ |
| 51 | + $request->validated(); | ||
| 52 | + $aiCommandLogic->ai_add(); | ||
| 53 | + $this->response('success'); | ||
| 34 | } | 54 | } |
| 35 | 55 | ||
| 36 | /** | 56 | /** |
| @@ -39,8 +59,14 @@ class AiCommandController extends BaseController | @@ -39,8 +59,14 @@ class AiCommandController extends BaseController | ||
| 39 | * @author :liyuhang | 59 | * @author :liyuhang |
| 40 | * @method | 60 | * @method |
| 41 | */ | 61 | */ |
| 42 | - public function edit(){ | ||
| 43 | - | 62 | + public function edit(AiCommandRequest $request,AiCommandLogic $aiCommandLogic){ |
| 63 | + $request->validate([ | ||
| 64 | + 'id'=>'required' | ||
| 65 | + ],[ | ||
| 66 | + 'id.required' => 'ID不能为空' | ||
| 67 | + ]); | ||
| 68 | + $aiCommandLogic->ai_edit(); | ||
| 69 | + $this->response('success'); | ||
| 44 | } | 70 | } |
| 45 | 71 | ||
| 46 | /** | 72 | /** |
| @@ -49,7 +75,13 @@ class AiCommandController extends BaseController | @@ -49,7 +75,13 @@ class AiCommandController extends BaseController | ||
| 49 | * @author :liyuhang | 75 | * @author :liyuhang |
| 50 | * @method | 76 | * @method |
| 51 | */ | 77 | */ |
| 52 | - public function del(){ | ||
| 53 | - | 78 | + public function del(Request $request,AiCommandLogic $aiCommandLogic){ |
| 79 | + $request->validate([ | ||
| 80 | + 'id'=>'required' | ||
| 81 | + ],[ | ||
| 82 | + 'id.required' => 'ID不能为空' | ||
| 83 | + ]); | ||
| 84 | + $aiCommandLogic->ai_del(); | ||
| 85 | + $this->response('success'); | ||
| 54 | } | 86 | } |
| 55 | } | 87 | } |
| @@ -39,10 +39,26 @@ class BaseController extends Controller | @@ -39,10 +39,26 @@ class BaseController extends Controller | ||
| 39 | $this->get_param(); | 39 | $this->get_param(); |
| 40 | //日志记录 | 40 | //日志记录 |
| 41 | $this->set_user_log(); | 41 | $this->set_user_log(); |
| 42 | + //读取缓存 | ||
| 43 | + $this->get_cache(); | ||
| 42 | } | 44 | } |
| 45 | + | ||
| 43 | } | 46 | } |
| 44 | 47 | ||
| 45 | /** | 48 | /** |
| 49 | + * @name :读取缓存 | ||
| 50 | + * @return void | ||
| 51 | + * @author :liyuhang | ||
| 52 | + * @method | ||
| 53 | + */ | ||
| 54 | + public function get_cache(){ | ||
| 55 | + //TODO::读取缓存 | ||
| 56 | + $data = Cache::get('cache_'.$this->request->route()->getName()); | ||
| 57 | + if(isset($data) && !empty($data)){ | ||
| 58 | + $this->response('success',Code::SUCCESS,$data); | ||
| 59 | + } | ||
| 60 | + } | ||
| 61 | + /** | ||
| 46 | * @name 参数过滤 | 62 | * @name 参数过滤 |
| 47 | * @return void | 63 | * @return void |
| 48 | * @author :liyuhang | 64 | * @author :liyuhang |
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | -namespace App\Http\Controllers\Bside; | 3 | +namespace App\Http\Controllers\Bside\User; |
| 4 | 4 | ||
| 5 | use App\Helper\Arr; | 5 | use App\Helper\Arr; |
| 6 | +use App\Http\Controllers\Bside\BaseController; | ||
| 6 | use App\Http\Logic\Bside\DeptLogic; | 7 | use App\Http\Logic\Bside\DeptLogic; |
| 7 | use App\Http\Requests\Bside\DeptRequest; | 8 | use App\Http\Requests\Bside\DeptRequest; |
| 8 | use App\Rules\Ids; | 9 | use App\Rules\Ids; |
| @@ -9,6 +9,7 @@ use App\Http\Logic\Bside\User\UserLogic; | @@ -9,6 +9,7 @@ use App\Http\Logic\Bside\User\UserLogic; | ||
| 9 | use App\Http\Requests\Bside\User\UserRequest; | 9 | use App\Http\Requests\Bside\User\UserRequest; |
| 10 | use App\Models\User\User as UserModel; | 10 | use App\Models\User\User as UserModel; |
| 11 | use Illuminate\Http\Request; | 11 | use Illuminate\Http\Request; |
| 12 | +use Illuminate\Support\Facades\Cache; | ||
| 12 | 13 | ||
| 13 | class UserController extends BaseController | 14 | class UserController extends BaseController |
| 14 | { | 15 | { |
| @@ -18,13 +19,15 @@ class UserController extends BaseController | @@ -18,13 +19,15 @@ class UserController extends BaseController | ||
| 18 | * @author :liyuhang | 19 | * @author :liyuhang |
| 19 | * @method | 20 | * @method |
| 20 | */ | 21 | */ |
| 21 | - public function lists(UserModel $userModel){ | ||
| 22 | - //TODO::搜索参数处理 | 22 | + public function lists(Request $request,UserModel $userModel){ |
| 23 | + //TODO::搜索参数统一处理 | ||
| 23 | $this->map['project_id'] = $this->user['project_id']; | 24 | $this->map['project_id'] = $this->user['project_id']; |
| 24 | $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at']); | 25 | $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at']); |
| 25 | if(empty($lists)){ | 26 | if(empty($lists)){ |
| 26 | $this->response('error',Code::USER_ERROR,[]); | 27 | $this->response('error',Code::USER_ERROR,[]); |
| 27 | } | 28 | } |
| 29 | + //TODO::写入缓存 | ||
| 30 | + Cache::add('cache_'.$request->route()->getName(),$lists); | ||
| 28 | $this->response('success',Code::SUCCESS,$lists); | 31 | $this->response('success',Code::SUCCESS,$lists); |
| 29 | } | 32 | } |
| 30 | 33 |
app/Http/Logic/Aside/Ai/AiCommandLogic.php
0 → 100644
| 1 | +<?php | ||
| 2 | + | ||
| 3 | +namespace App\Http\Logic\Aside\Ai; | ||
| 4 | + | ||
| 5 | +use App\Http\Logic\Aside\BaseLogic; | ||
| 6 | +use App\Models\AiCommand as AiCommandModel; | ||
| 7 | + | ||
| 8 | +class AiCommandLogic extends BaseLogic | ||
| 9 | +{ | ||
| 10 | + public function __construct() | ||
| 11 | + { | ||
| 12 | + parent::__construct(); | ||
| 13 | + | ||
| 14 | + $this->model = new AiCommandModel(); | ||
| 15 | + $this->param = $this->requestAll; | ||
| 16 | + } | ||
| 17 | + | ||
| 18 | + /** | ||
| 19 | + * @name :详情 | ||
| 20 | + * @return void | ||
| 21 | + * @author :liyuhang | ||
| 22 | + * @method | ||
| 23 | + */ | ||
| 24 | + public function ai_info(){ | ||
| 25 | + return $this->success(); | ||
| 26 | + } | ||
| 27 | + | ||
| 28 | + /** | ||
| 29 | + * @name :添加指令 | ||
| 30 | + * @return void | ||
| 31 | + * @author :liyuhang | ||
| 32 | + * @method | ||
| 33 | + */ | ||
| 34 | + public function ai_add(){ | ||
| 35 | + return $this->success(); | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * @name :编辑站内信 | ||
| 40 | + * @return void | ||
| 41 | + * @author :liyuhang | ||
| 42 | + * @method | ||
| 43 | + */ | ||
| 44 | + public function ai_edit(){ | ||
| 45 | + return $this->success(); | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + /** | ||
| 49 | + * @name :删除站内信 | ||
| 50 | + * @return void | ||
| 51 | + * @author :liyuhang | ||
| 52 | + * @method | ||
| 53 | + */ | ||
| 54 | + public function ai_del(){ | ||
| 55 | + return $this->success(); | ||
| 56 | + } | ||
| 57 | +} |
app/Http/Logic/Aside/AiCommandLogic.php
已删除
100644 → 0
| 1 | -<?php | ||
| 2 | - | ||
| 3 | -namespace App\Http\Logic\Aside; | ||
| 4 | - | ||
| 5 | -use App\Http\Logic\Aside\BaseLogic; | ||
| 6 | -use App\Models\AiCommand as AiCommandModel; | ||
| 7 | - | ||
| 8 | -class AiCommandLogic extends BaseLogic | ||
| 9 | -{ | ||
| 10 | - public function __construct() | ||
| 11 | - { | ||
| 12 | - parent::__construct(); | ||
| 13 | - | ||
| 14 | - $this->model = new AiCommandModel(); | ||
| 15 | - } | ||
| 16 | - | ||
| 17 | -} |
| 1 | +<?php | ||
| 2 | + | ||
| 3 | +namespace App\Http\Requests\Aside\Ai; | ||
| 4 | + | ||
| 5 | +use Illuminate\Foundation\Http\FormRequest; | ||
| 6 | + | ||
| 7 | +class AiCommandRequest extends FormRequest | ||
| 8 | +{ | ||
| 9 | + /** | ||
| 10 | + * Determine if the user is authorized to make this request. | ||
| 11 | + * | ||
| 12 | + * @return bool | ||
| 13 | + */ | ||
| 14 | + public function authorize() | ||
| 15 | + { | ||
| 16 | + return true; | ||
| 17 | + } | ||
| 18 | + | ||
| 19 | + /** | ||
| 20 | + * Get the validation rules that apply to the request. | ||
| 21 | + * | ||
| 22 | + * @return array | ||
| 23 | + */ | ||
| 24 | + public function rules() | ||
| 25 | + { | ||
| 26 | + return [ | ||
| 27 | + 'key'=>'required', | ||
| 28 | + 'scene'=>'required', | ||
| 29 | + 'ai'=>'required', | ||
| 30 | + ]; | ||
| 31 | + } | ||
| 32 | + | ||
| 33 | + public function messages() | ||
| 34 | + { | ||
| 35 | + return [ | ||
| 36 | + 'key.required'=>'指令不能为空', | ||
| 37 | + 'scene.required' => '场景不能为空', | ||
| 38 | + 'ai.required'=>'指令不猛为空', | ||
| 39 | + ]; | ||
| 40 | + } | ||
| 41 | +} |
| @@ -27,6 +27,7 @@ class NewsRequest extends FormRequest | @@ -27,6 +27,7 @@ class NewsRequest extends FormRequest | ||
| 27 | 'name'=>'required|max:100', | 27 | 'name'=>'required|max:100', |
| 28 | 'remark'=>'required|max:100', | 28 | 'remark'=>'required|max:100', |
| 29 | 'text'=>'required|min:10', | 29 | 'text'=>'required|min:10', |
| 30 | + 'category_id'=>'required', | ||
| 30 | ]; | 31 | ]; |
| 31 | } | 32 | } |
| 32 | 33 | ||
| @@ -39,6 +40,7 @@ class NewsRequest extends FormRequest | @@ -39,6 +40,7 @@ class NewsRequest extends FormRequest | ||
| 39 | 'name.max'=>'名称最大100字', | 40 | 'name.max'=>'名称最大100字', |
| 40 | 'remark.max'=>'简介最大100字', | 41 | 'remark.max'=>'简介最大100字', |
| 41 | 'text.max'=>'内容最小100字', | 42 | 'text.max'=>'内容最小100字', |
| 43 | + 'category_id.required'=>'分类不能为空', | ||
| 42 | ]; | 44 | ]; |
| 43 | } | 45 | } |
| 44 | } | 46 | } |
| @@ -147,10 +147,10 @@ Route::middleware(['bloginauth'])->group(function () { | @@ -147,10 +147,10 @@ Route::middleware(['bloginauth'])->group(function () { | ||
| 147 | 147 | ||
| 148 | //组织架构 | 148 | //组织架构 |
| 149 | Route::prefix('dept')->group(function () { | 149 | Route::prefix('dept')->group(function () { |
| 150 | - Route::get('/', [\App\Http\Controllers\Bside\DeptController::class, 'index'])->name('dept'); | ||
| 151 | - Route::get('/info', [\App\Http\Controllers\Bside\DeptController::class, 'info'])->name('dept_info'); | ||
| 152 | - Route::post('/save', [\App\Http\Controllers\Bside\DeptController::class, 'save'])->name('dept_save'); | ||
| 153 | - Route::any('/delete', [\App\Http\Controllers\Bside\DeptController::class, 'delete'])->name('dept_delete'); | 150 | + Route::get('/', [\App\Http\Controllers\Bside\User\DeptController::class, 'index'])->name('dept'); |
| 151 | + Route::get('/info', [\App\Http\Controllers\Bside\User\DeptController::class, 'info'])->name('dept_info'); | ||
| 152 | + Route::post('/save', [\App\Http\Controllers\Bside\User\DeptController::class, 'save'])->name('dept_save'); | ||
| 153 | + Route::any('/delete', [\App\Http\Controllers\Bside\User\DeptController::class, 'delete'])->name('dept_delete'); | ||
| 154 | }); | 154 | }); |
| 155 | 155 | ||
| 156 | //文件操作 | 156 | //文件操作 |
-
请 注册 或 登录 后发表评论