周海龙 / globalso · 提交

转到一个项目

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

gx

内嵌 并排对比
正在显示 12 个修改的文件 包含 49 行增加 和 90 行删除
@@ -95,8 +95,8 @@ class BlogController extends BaseController @@ -95,8 +95,8 @@ class BlogController extends BaseController
95 * @author :liyuhang 95 * @author :liyuhang
96 * @method 96 * @method
97 */ 97 */
98 - public function edit_seo(Request $request,BlogLogic $blogLogic){  
99 - $request->validate([ 98 + public function edit_seo(BlogLogic $blogLogic){
  99 + $this->request->validate([
100 'id'=>['required'], 100 'id'=>['required'],
101 'seo_title'=>['required'], 101 'seo_title'=>['required'],
102 'seo_description'=>['required'], 102 'seo_description'=>['required'],
@@ -116,8 +116,8 @@ class BlogController extends BaseController @@ -116,8 +116,8 @@ class BlogController extends BaseController
116 * @author :liyuhang 116 * @author :liyuhang
117 * @method 117 * @method
118 */ 118 */
119 - public function status(Request $request,BlogLogic $blogLogic){  
120 - $request->validate([ 119 + public function status(BlogLogic $blogLogic){
  120 + $this->request->validate([
121 'id'=>['required'], 121 'id'=>['required'],
122 ],[ 122 ],[
123 'id.required' => 'ID不能为空', 123 'id.required' => 'ID不能为空',
@@ -133,8 +133,8 @@ class BlogController extends BaseController @@ -133,8 +133,8 @@ class BlogController extends BaseController
133 * @author :liyuhang 133 * @author :liyuhang
134 * @method 134 * @method
135 */ 135 */
136 - public function del(Request $request,BlogLogic $blogLogic){  
137 - $request->validate([ 136 + public function del(BlogLogic $blogLogic){
  137 + $this->request->validate([
138 'id'=>['required'], 138 'id'=>['required'],
139 ],[ 139 ],[
140 'id.required' => 'ID不能为空', 140 'id.required' => 'ID不能为空',
@@ -59,8 +59,8 @@ class BlogLabelController extends BaseController @@ -59,8 +59,8 @@ class BlogLabelController extends BaseController
59 * @author :liyuhang 59 * @author :liyuhang
60 * @method 60 * @method
61 */ 61 */
62 - public function status(Request $request,BlogLabelLogic $blogLabelLogic){  
63 - $request->validate([ 62 + public function status(BlogLabelLogic $blogLabelLogic){
  63 + $this->request->validate([
64 'id'=>['required'], 64 'id'=>['required'],
65 ],[ 65 ],[
66 'id.required' => 'ID不能为空', 66 'id.required' => 'ID不能为空',
@@ -76,8 +76,8 @@ class BlogLabelController extends BaseController @@ -76,8 +76,8 @@ class BlogLabelController extends BaseController
76 * @author :liyuhang 76 * @author :liyuhang
77 * @method 77 * @method
78 */ 78 */
79 - public function del(Request $request,BlogLabelLogic $blogLabelLogic){  
80 - $request->validate([ 79 + public function del(BlogLabelLogic $blogLabelLogic){
  80 + $this->request->validate([
81 'id'=>['required'], 81 'id'=>['required'],
82 ],[ 82 ],[
83 'id.required' => 'ID不能为空', 83 'id.required' => 'ID不能为空',
@@ -22,8 +22,8 @@ class ComController extends BaseController @@ -22,8 +22,8 @@ class ComController extends BaseController
22 * @author :liyuhang 22 * @author :liyuhang
23 * @method 23 * @method
24 */ 24 */
25 - public function login(Request $request){  
26 - $request->validate([ 25 + public function login(){
  26 + $this->request->validate([
27 'mobile'=>['required'], 27 'mobile'=>['required'],
28 'password'=>['required'], 28 'password'=>['required'],
29 ],[ 29 ],[
@@ -84,8 +84,8 @@ class ComController extends BaseController @@ -84,8 +84,8 @@ class ComController extends BaseController
84 * @author :liyuhang 84 * @author :liyuhang
85 * @method 85 * @method
86 */ 86 */
87 - public function edit_info(Request $request){  
88 - $request->validate([ 87 + public function edit_info(){
  88 + $this->request->validate([
89 'password'=>['required'], 89 'password'=>['required'],
90 'name'=>['required'], 90 'name'=>['required'],
91 ],[ 91 ],[
@@ -46,8 +46,8 @@ class MailController extends BaseController @@ -46,8 +46,8 @@ class MailController extends BaseController
46 * @author :liyuhang 46 * @author :liyuhang
47 * @method 47 * @method
48 */ 48 */
49 - public function info(Request $request,MailLogic $mailLogic){  
50 - $request->validate([ 49 + public function info(MailLogic $mailLogic){
  50 + $this->request->validate([
51 'id'=>['required'] 51 'id'=>['required']
52 ],[ 52 ],[
53 'id.required' => 'ID不能为空' 53 'id.required' => 'ID不能为空'
@@ -30,8 +30,8 @@ class NewsCategoryController extends BaseController @@ -30,8 +30,8 @@ class NewsCategoryController extends BaseController
30 * @author :liyuhang 30 * @author :liyuhang
31 * @method 31 * @method
32 */ 32 */
33 - public function info(Request $request,NewsCategoryLogic $newsCategoryLogic){  
34 - $request->validate([ 33 + public function info(NewsCategoryLogic $newsCategoryLogic){
  34 + $this->request->validate([
35 'id'=>['required'] 35 'id'=>['required']
36 ],[ 36 ],[
37 'id.required' => 'ID不能为空' 37 'id.required' => 'ID不能为空'
@@ -74,8 +74,8 @@ class NewsCategoryController extends BaseController @@ -74,8 +74,8 @@ class NewsCategoryController extends BaseController
74 * @author :liyuhang 74 * @author :liyuhang
75 * @method 75 * @method
76 */ 76 */
77 - public function status(Request $request,NewsCategoryLogic $newsCategoryLogic){  
78 - $request->validate([ 77 + public function status(NewsCategoryLogic $newsCategoryLogic){
  78 + $this->request->validate([
79 'id'=>['required'], 79 'id'=>['required'],
80 ],[ 80 ],[
81 'id.required' => 'ID不能为空', 81 'id.required' => 'ID不能为空',
@@ -90,8 +90,8 @@ class NewsCategoryController extends BaseController @@ -90,8 +90,8 @@ class NewsCategoryController extends BaseController
90 * @author :liyuhang 90 * @author :liyuhang
91 * @method 91 * @method
92 */ 92 */
93 - public function del(Request $request,NewsCategoryLogic $newsCategoryLogic){  
94 - $request->validate([ 93 + public function del(NewsCategoryLogic $newsCategoryLogic){
  94 + $this->request->validate([
95 'id'=>['required'], 95 'id'=>['required'],
96 ],[ 96 ],[
97 'id.required' => 'ID不能为空', 97 'id.required' => 'ID不能为空',
@@ -50,8 +50,8 @@ class NewsController extends BaseController @@ -50,8 +50,8 @@ class NewsController extends BaseController
50 * @author :liyuhang 50 * @author :liyuhang
51 * @method 51 * @method
52 */ 52 */
53 - public function info(Request $request,NewsLogic $newsLogic){  
54 - $request->validate([ 53 + public function info(NewsLogic $newsLogic){
  54 + $this->request->validate([
55 'id'=>['required'], 55 'id'=>['required'],
56 ],[ 56 ],[
57 'id.required' => 'ID不能为空', 57 'id.required' => 'ID不能为空',
@@ -93,8 +93,8 @@ class NewsController extends BaseController @@ -93,8 +93,8 @@ class NewsController extends BaseController
93 * @author :liyuhang 93 * @author :liyuhang
94 * @method 94 * @method
95 */ 95 */
96 - public function edit_seo(Request $request,NewsLogic $newsLogic){  
97 - $request->validate([ 96 + public function edit_seo(NewsLogic $newsLogic){
  97 + $this->request->validate([
98 'id'=>['required'], 98 'id'=>['required'],
99 'seo_title'=>['required'], 99 'seo_title'=>['required'],
100 'seo_description'=>['required'], 100 'seo_description'=>['required'],
@@ -115,8 +115,8 @@ class NewsController extends BaseController @@ -115,8 +115,8 @@ class NewsController extends BaseController
115 * @author :liyuhang 115 * @author :liyuhang
116 * @method 116 * @method
117 */ 117 */
118 - public function status(Request $request,NewsLogic $newsLogic){  
119 - $request->validate([ 118 + public function status(NewsLogic $newsLogic){
  119 + $this->request->validate([
120 'id'=>['required'], 120 'id'=>['required'],
121 ],[ 121 ],[
122 'id.required' => 'ID不能为空', 122 'id.required' => 'ID不能为空',
@@ -131,8 +131,8 @@ class NewsController extends BaseController @@ -131,8 +131,8 @@ class NewsController extends BaseController
131 * @author :liyuhang 131 * @author :liyuhang
132 * @method 132 * @method
133 */ 133 */
134 - public function del(Request $request,NewsLogic $newsLogic){  
135 - $request->validate([ 134 + public function del(NewsLogic $newsLogic){
  135 + $this->request->validate([
136 'id'=>['required'], 136 'id'=>['required'],
137 ],[ 137 ],[
138 'id.required' => 'ID不能为空', 138 'id.required' => 'ID不能为空',
@@ -142,25 +142,4 @@ class NewsController extends BaseController @@ -142,25 +142,4 @@ class NewsController extends BaseController
142 $this->response('success'); 142 $this->response('success');
143 } 143 }
144 144
145 - /**  
146 - * @name :ai生成  
147 - * @return void  
148 - * @author :liyuhang  
149 - * @method  
150 - */  
151 - public function ai_news(Request $request){  
152 - # id, key, scene, ai  
153 - $request->validate([  
154 - 'keywords'=>['required'],  
155 - 'key'=>['required']  
156 - ],[  
157 - 'keywords.required' => '关键字不能为空',  
158 - 'key.required' => '场景不能为空',  
159 - ]);  
160 - #TODO 通过key获取到ai指令对象  
161 - $url = 'v2/openai_chat';  
162 - $data = Common::send_openai_msg($url,$request->post());  
163 - $this->response('success',Code::SUCCESS,$data);  
164 - }  
165 -  
166 } 145 }
@@ -45,9 +45,9 @@ class DeptController extends BaseController @@ -45,9 +45,9 @@ class DeptController extends BaseController
45 return $this->success($data); 45 return $this->success($data);
46 } 46 }
47 47
48 - public function delete(Request $request, DeptLogic $logic) 48 + public function delete(DeptLogic $logic)
49 { 49 {
50 - $request->validate([ 50 + $this->request->validate([
51 'ids'=>['required', new Ids()] 51 'ids'=>['required', new Ids()]
52 ],[ 52 ],[
53 'ids.required' => 'ID不能为空' 53 'ids.required' => 'ID不能为空'
@@ -36,8 +36,8 @@ class ProjectGroupController extends BaseController @@ -36,8 +36,8 @@ class ProjectGroupController extends BaseController
36 * @author :liyuhang 36 * @author :liyuhang
37 * @method 37 * @method
38 */ 38 */
39 - public function info(Request $request,ProjectGroupModel $projectGroupModel){  
40 - $request->validate([ 39 + public function info(ProjectGroupModel $projectGroupModel){
  40 + $this->request->validate([
41 'id'=>['required', new Ids()], 41 'id'=>['required', new Ids()],
42 ],[ 42 ],[
43 'id.required' => 'ID不能为空', 43 'id.required' => 'ID不能为空',
@@ -110,8 +110,8 @@ class ProjectGroupController extends BaseController @@ -110,8 +110,8 @@ class ProjectGroupController extends BaseController
110 * @author :liyuhang 110 * @author :liyuhang
111 * @method 111 * @method
112 */ 112 */
113 - public function del(Request $request,ProjectGroupModel $projectGroupModel){  
114 - $request->validate([ 113 + public function del(ProjectGroupModel $projectGroupModel){
  114 + $this->request->validate([
115 'id'=>['required'], 115 'id'=>['required'],
116 ],[ 116 ],[
117 'id.required' => 'ID不能为空', 117 'id.required' => 'ID不能为空',
@@ -45,8 +45,8 @@ class ProjectRoleController extends BaseController @@ -45,8 +45,8 @@ class ProjectRoleController extends BaseController
45 * @author :liyuhang 45 * @author :liyuhang
46 * @method 46 * @method
47 */ 47 */
48 - public function info(Request $request,RoleLogic $roleLogic){  
49 - $request->validate([ 48 + public function info(RoleLogic $roleLogic){
  49 + $this->request->validate([
50 'id'=>['required'], 50 'id'=>['required'],
51 ],[ 51 ],[
52 'id.required' => 'ID不能为空', 52 'id.required' => 'ID不能为空',
@@ -98,8 +98,8 @@ class ProjectRoleController extends BaseController @@ -98,8 +98,8 @@ class ProjectRoleController extends BaseController
98 * @author :liyuhang 98 * @author :liyuhang
99 * @method 99 * @method
100 */ 100 */
101 - public function status(Request $request,RoleLogic $roleLogic){  
102 - $request->validate([ 101 + public function status(RoleLogic $roleLogic){
  102 + $this->request->validate([
103 'id'=>['required'], 103 'id'=>['required'],
104 ],[ 104 ],[
105 'id.required' => 'ID不能为空', 105 'id.required' => 'ID不能为空',
@@ -114,8 +114,8 @@ class ProjectRoleController extends BaseController @@ -114,8 +114,8 @@ class ProjectRoleController extends BaseController
114 * @author :liyuhang 114 * @author :liyuhang
115 * @method 115 * @method
116 */ 116 */
117 - public function del(Request $request,RoleLogic $roleLogic){  
118 - $request->validate([ 117 + public function del(RoleLogic $roleLogic){
  118 + $this->request->validate([
119 'id'=>['required'] 119 'id'=>['required']
120 ],[ 120 ],[
121 'id.required' => 'ID不能为空' 121 'id.required' => 'ID不能为空'
@@ -19,15 +19,13 @@ class UserController extends BaseController @@ -19,15 +19,13 @@ class UserController extends BaseController
19 * @author :liyuhang 19 * @author :liyuhang
20 * @method 20 * @method
21 */ 21 */
22 - public function lists(Request $request,UserModel $userModel){ 22 + public function lists(UserModel $userModel){
23 //TODO::搜索参数统一处理 23 //TODO::搜索参数统一处理
24 $this->map['project_id'] = $this->user['project_id']; 24 $this->map['project_id'] = $this->user['project_id'];
25 $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']);
26 if(empty($lists)){ 26 if(empty($lists)){
27 $this->response('error',Code::USER_ERROR,[]); 27 $this->response('error',Code::USER_ERROR,[]);
28 } 28 }
29 - //TODO::写入缓存  
30 - Cache::add('cache_'.$request->route()->getName(),$lists);  
31 $this->response('success',Code::SUCCESS,$lists); 29 $this->response('success',Code::SUCCESS,$lists);
32 } 30 }
33 31
@@ -65,8 +63,8 @@ class UserController extends BaseController @@ -65,8 +63,8 @@ class UserController extends BaseController
65 * @author :liyuhang 63 * @author :liyuhang
66 * @method 64 * @method
67 */ 65 */
68 - public function status(Request $request,UserLogic $userLogic){  
69 - $request->validate([ 66 + public function status(UserLogic $userLogic){
  67 + $this->request->validate([
70 'id'=>['required'], 68 'id'=>['required'],
71 ],[ 69 ],[
72 'id.required' => 'ID不能为空', 70 'id.required' => 'ID不能为空',
@@ -81,8 +79,8 @@ class UserController extends BaseController @@ -81,8 +79,8 @@ class UserController extends BaseController
81 * @author :liyuhang 79 * @author :liyuhang
82 * @method 80 * @method
83 */ 81 */
84 - public function info(Request $request,UserLogic $userLogic){  
85 - $request->validate([ 82 + public function info(UserLogic $userLogic){
  83 + $this->request->validate([
86 'id'=>['required'], 84 'id'=>['required'],
87 ],[ 85 ],[
88 'id.required' => 'ID不能为空', 86 'id.required' => 'ID不能为空',
@@ -96,8 +94,8 @@ class UserController extends BaseController @@ -96,8 +94,8 @@ class UserController extends BaseController
96 * @author :liyuhang 94 * @author :liyuhang
97 * @method 95 * @method
98 */ 96 */
99 - public function del(Request $request,UserLogic $userLogic){  
100 - $request->validate([ 97 + public function del(UserLogic $userLogic){
  98 + $this->request->validate([
101 'id'=>['required'], 99 'id'=>['required'],
102 ],[ 100 ],[
103 'id.required' => 'ID不能为空', 101 'id.required' => 'ID不能为空',
1 -<?php  
2 -  
3 -namespace App\Http\Controllers\Bside\User;  
4 -  
5 -use App\Http\Controllers\Bside\BaseController;  
6 -use App\Models\User\UserLogin as UserLoginModel;  
7 -  
8 -/**  
9 - * @name:用户登录日志  
10 - */  
11 -class UserLoginController extends BaseController  
12 -{  
13 - public function lists(){  
14 -  
15 - }  
16 -}  
@@ -14,8 +14,6 @@ Route::middleware(['bloginauth'])->group(function () { @@ -14,8 +14,6 @@ Route::middleware(['bloginauth'])->group(function () {
14 Route::any('/get_menu', [\App\Http\Controllers\Bside\ComController::class, 'get_menu'])->name('get_menu'); 14 Route::any('/get_menu', [\App\Http\Controllers\Bside\ComController::class, 'get_menu'])->name('get_menu');
15 //获取当前登录用户项目详情 15 //获取当前登录用户项目详情
16 Route::any('/get_project', [\App\Http\Controllers\Bside\ComController::class, 'get_project'])->name('get_project'); 16 Route::any('/get_project', [\App\Http\Controllers\Bside\ComController::class, 'get_project'])->name('get_project');
17 - //消息通知列表  
18 - Route::any('/notice/', [\App\Http\Controllers\Bside\NoticeController::class, 'lists'])->name('notice_lists');  
19 //用户相关路由 17 //用户相关路由
20 Route::prefix('user')->group(function () { 18 Route::prefix('user')->group(function () {
21 Route::any('/', [\App\Http\Controllers\Bside\User\UserController::class, 'lists'])->name('user_lists'); 19 Route::any('/', [\App\Http\Controllers\Bside\User\UserController::class, 'lists'])->name('user_lists');