周海龙 / globalso · 提交

转到一个项目

作者 liyuhang
提交 18055425f54ba385024841151d360afa4afa93db 1 个父辈 f576f842

gx

内嵌 并排对比
正在显示 12 个修改的文件 包含 49 行增加 和 90 行删除
... ... @@ -95,8 +95,8 @@ class BlogController extends BaseController
* @author :liyuhang
* @method
*/
public function edit_seo(Request $request,BlogLogic $blogLogic){
$request->validate([
public function edit_seo(BlogLogic $blogLogic){
$this->request->validate([
'id'=>['required'],
'seo_title'=>['required'],
'seo_description'=>['required'],
... ... @@ -116,8 +116,8 @@ class BlogController extends BaseController
* @author :liyuhang
* @method
*/
public function status(Request $request,BlogLogic $blogLogic){
$request->validate([
public function status(BlogLogic $blogLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -133,8 +133,8 @@ class BlogController extends BaseController
* @author :liyuhang
* @method
*/
public function del(Request $request,BlogLogic $blogLogic){
$request->validate([
public function del(BlogLogic $blogLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ...
... ... @@ -59,8 +59,8 @@ class BlogLabelController extends BaseController
* @author :liyuhang
* @method
*/
public function status(Request $request,BlogLabelLogic $blogLabelLogic){
$request->validate([
public function status(BlogLabelLogic $blogLabelLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -76,8 +76,8 @@ class BlogLabelController extends BaseController
* @author :liyuhang
* @method
*/
public function del(Request $request,BlogLabelLogic $blogLabelLogic){
$request->validate([
public function del(BlogLabelLogic $blogLabelLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ...
... ... @@ -22,8 +22,8 @@ class ComController extends BaseController
* @author :liyuhang
* @method
*/
public function login(Request $request){
$request->validate([
public function login(){
$this->request->validate([
'mobile'=>['required'],
'password'=>['required'],
],[
... ... @@ -84,8 +84,8 @@ class ComController extends BaseController
* @author :liyuhang
* @method
*/
public function edit_info(Request $request){
$request->validate([
public function edit_info(){
$this->request->validate([
'password'=>['required'],
'name'=>['required'],
],[
... ...
... ... @@ -46,8 +46,8 @@ class MailController extends BaseController
* @author :liyuhang
* @method
*/
public function info(Request $request,MailLogic $mailLogic){
$request->validate([
public function info(MailLogic $mailLogic){
$this->request->validate([
'id'=>['required']
],[
'id.required' => 'ID不能为空'
... ...
... ... @@ -30,8 +30,8 @@ class NewsCategoryController extends BaseController
* @author :liyuhang
* @method
*/
public function info(Request $request,NewsCategoryLogic $newsCategoryLogic){
$request->validate([
public function info(NewsCategoryLogic $newsCategoryLogic){
$this->request->validate([
'id'=>['required']
],[
'id.required' => 'ID不能为空'
... ... @@ -74,8 +74,8 @@ class NewsCategoryController extends BaseController
* @author :liyuhang
* @method
*/
public function status(Request $request,NewsCategoryLogic $newsCategoryLogic){
$request->validate([
public function status(NewsCategoryLogic $newsCategoryLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -90,8 +90,8 @@ class NewsCategoryController extends BaseController
* @author :liyuhang
* @method
*/
public function del(Request $request,NewsCategoryLogic $newsCategoryLogic){
$request->validate([
public function del(NewsCategoryLogic $newsCategoryLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ...
... ... @@ -50,8 +50,8 @@ class NewsController extends BaseController
* @author :liyuhang
* @method
*/
public function info(Request $request,NewsLogic $newsLogic){
$request->validate([
public function info(NewsLogic $newsLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -93,8 +93,8 @@ class NewsController extends BaseController
* @author :liyuhang
* @method
*/
public function edit_seo(Request $request,NewsLogic $newsLogic){
$request->validate([
public function edit_seo(NewsLogic $newsLogic){
$this->request->validate([
'id'=>['required'],
'seo_title'=>['required'],
'seo_description'=>['required'],
... ... @@ -115,8 +115,8 @@ class NewsController extends BaseController
* @author :liyuhang
* @method
*/
public function status(Request $request,NewsLogic $newsLogic){
$request->validate([
public function status(NewsLogic $newsLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -131,8 +131,8 @@ class NewsController extends BaseController
* @author :liyuhang
* @method
*/
public function del(Request $request,NewsLogic $newsLogic){
$request->validate([
public function del(NewsLogic $newsLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -142,25 +142,4 @@ class NewsController extends BaseController
$this->response('success');
}
/**
* @name :ai生成
* @return void
* @author :liyuhang
* @method
*/
public function ai_news(Request $request){
# id, key, scene, ai
$request->validate([
'keywords'=>['required'],
'key'=>['required']
],[
'keywords.required' => '关键字不能为空',
'key.required' => '场景不能为空',
]);
#TODO 通过key获取到ai指令对象
$url = 'v2/openai_chat';
$data = Common::send_openai_msg($url,$request->post());
$this->response('success',Code::SUCCESS,$data);
}
}
... ...
... ... @@ -45,9 +45,9 @@ class DeptController extends BaseController
return $this->success($data);
}
public function delete(Request $request, DeptLogic $logic)
public function delete(DeptLogic $logic)
{
$request->validate([
$this->request->validate([
'ids'=>['required', new Ids()]
],[
'ids.required' => 'ID不能为空'
... ...
... ... @@ -36,8 +36,8 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function info(Request $request,ProjectGroupModel $projectGroupModel){
$request->validate([
public function info(ProjectGroupModel $projectGroupModel){
$this->request->validate([
'id'=>['required', new Ids()],
],[
'id.required' => 'ID不能为空',
... ... @@ -110,8 +110,8 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function del(Request $request,ProjectGroupModel $projectGroupModel){
$request->validate([
public function del(ProjectGroupModel $projectGroupModel){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ...
... ... @@ -45,8 +45,8 @@ class ProjectRoleController extends BaseController
* @author :liyuhang
* @method
*/
public function info(Request $request,RoleLogic $roleLogic){
$request->validate([
public function info(RoleLogic $roleLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -98,8 +98,8 @@ class ProjectRoleController extends BaseController
* @author :liyuhang
* @method
*/
public function status(Request $request,RoleLogic $roleLogic){
$request->validate([
public function status(RoleLogic $roleLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -114,8 +114,8 @@ class ProjectRoleController extends BaseController
* @author :liyuhang
* @method
*/
public function del(Request $request,RoleLogic $roleLogic){
$request->validate([
public function del(RoleLogic $roleLogic){
$this->request->validate([
'id'=>['required']
],[
'id.required' => 'ID不能为空'
... ...
... ... @@ -19,15 +19,13 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function lists(Request $request,UserModel $userModel){
public function lists(UserModel $userModel){
//TODO::搜索参数统一处理
$this->map['project_id'] = $this->user['project_id'];
$lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at']);
if(empty($lists)){
$this->response('error',Code::USER_ERROR,[]);
}
//TODO::写入缓存
Cache::add('cache_'.$request->route()->getName(),$lists);
$this->response('success',Code::SUCCESS,$lists);
}
... ... @@ -65,8 +63,8 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function status(Request $request,UserLogic $userLogic){
$request->validate([
public function status(UserLogic $userLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -81,8 +79,8 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function info(Request $request,UserLogic $userLogic){
$request->validate([
public function info(UserLogic $userLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ... @@ -96,8 +94,8 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function del(Request $request,UserLogic $userLogic){
$request->validate([
public function del(UserLogic $userLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
... ...
<?php
namespace App\Http\Controllers\Bside\User;
use App\Http\Controllers\Bside\BaseController;
use App\Models\User\UserLogin as UserLoginModel;
/**
* @name:用户登录日志
*/
class UserLoginController extends BaseController
{
public function lists(){
}
}
... ... @@ -14,8 +14,6 @@ Route::middleware(['bloginauth'])->group(function () {
Route::any('/get_menu', [\App\Http\Controllers\Bside\ComController::class, 'get_menu'])->name('get_menu');
//获取当前登录用户项目详情
Route::any('/get_project', [\App\Http\Controllers\Bside\ComController::class, 'get_project'])->name('get_project');
//消息通知列表
Route::any('/notice/', [\App\Http\Controllers\Bside\NoticeController::class, 'lists'])->name('notice_lists');
//用户相关路由
Route::prefix('user')->group(function () {
Route::any('/', [\App\Http\Controllers\Bside\User\UserController::class, 'lists'])->name('user_lists');
... ...