周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 00b85e46a3b3185fe2e1db7f17130cecc0c6c1dc 2 个父辈 4c14c055 810c6274

Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

内嵌 并排对比
正在显示 43 个修改的文件 包含 615 行增加 和 340 行删除
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 2
3 namespace App\Helper; 3 namespace App\Helper;
4 4
5 -use App\Enums\Common\Code;  
6 -use App\Models\AiCommand as AiCommandModel; 5 +use App\Models\Ai\AiCommand as AiCommandModel;
7 use App\Models\User\UserLog as UserLogModel; 6 use App\Models\User\UserLog as UserLogModel;
8 use App\Models\User\UserLogin as UserLoginModel; 7 use App\Models\User\UserLogin as UserLoginModel;
  8 +use Illuminate\Support\Facades\Cache;
9 9
10 class Common 10 class Common
11 { 11 {
@@ -46,16 +46,16 @@ class Common @@ -46,16 +46,16 @@ class Common
46 * @author :liyuhang 46 * @author :liyuhang
47 * @method 47 * @method
48 */ 48 */
49 - public function send_openai_msg($url){ 49 + public static function send_openai_msg($url,$param){
50 $url = HTTP_OPENAI_URL.$url; 50 $url = HTTP_OPENAI_URL.$url;
51 $aiCommandModel = New AiCommandModel(); 51 $aiCommandModel = New AiCommandModel();
52 //指定库获取指令 52 //指定库获取指令
53 - $info = $aiCommandModel->read(['key'=>$this->param['key']]); 53 + $info = $aiCommandModel->read(['key'=>$param['key']]);
54 if($info === false){ 54 if($info === false){
55 response('指令不存在',400); 55 response('指令不存在',400);
56 } 56 }
57 //替换关键字 57 //替换关键字
58 - $content = str_replace('$keyword$', $this->param['keywords'], $info['ai']); 58 + $content = str_replace('$keyword$', $param['keywords'], $info['ai']);
59 $data = [ 59 $data = [
60 'messages'=>[ 60 'messages'=>[
61 ['role'=>'system','content'=>$info['scene']], 61 ['role'=>'system','content'=>$info['scene']],
@@ -64,4 +64,57 @@ class Common @@ -64,4 +64,57 @@ class Common
64 ]; 64 ];
65 return http_post($url,json_encode($data)); 65 return http_post($url,json_encode($data));
66 } 66 }
  67 +
  68 + /**
  69 + * @name :获取缓存
  70 + * @return void
  71 + * @author :liyuhang
  72 + * @method
  73 + */
  74 + public static function get_user_cache($table,$id,$type = 'B'){
  75 + $data = [];
  76 + $cache = config('cache.user_is_cache');
  77 + if(isset($cache) && ($cache['is_cache'] == true)){
  78 + $key = 'cache_'.$table.'_'.$id.'_type';
  79 + $data = Cache::store('file')->get($key);
  80 + }
  81 + return $data;
  82 + }
  83 +
  84 + /**
  85 + * @name :写入缓存
  86 + * @return bool
  87 + * @author :liyuhang
  88 + * @method
  89 + */
  90 + public static function set_user_cache($data = [],$table,$id,$type = 'B'){
  91 + $cache = config('cache.user_is_cache');
  92 + if(isset($cache) && ($cache['is_cache'] == true)){
  93 + $key = 'cache_'.$table.'_'.$id.'_type';
  94 + Cache::store('file')->set($key,$data,3600);
  95 + }
  96 + return true;
  97 + }
  98 +
  99 + /**
  100 + * @name :清除缓存
  101 + * @return bool
  102 + * @author :liyuhang
  103 + * @method
  104 + */
  105 + public static function del_user_cache($table,$id,$type = 'B'){
  106 + $cache = config('cache.user_is_cache');
  107 + if(isset($cache) && ($cache['is_cache'] == true)){
  108 + if(is_array($id)){
  109 + foreach ($id as $v){
  110 + $key = 'cache_'.$table.'_'.$v.'_type';
  111 + Cache::store('file')->pull($key);
  112 + }
  113 + }else{
  114 + $key = 'cache_'.$table.'_'.$id.'_type';
  115 + }
  116 + Cache::store('file')->pull($key);
  117 + }
  118 + return true;
  119 + }
67 } 120 }
@@ -6,7 +6,7 @@ use App\Enums\Common\Code; @@ -6,7 +6,7 @@ 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; 7 use App\Http\Logic\Aside\Ai\AiCommandLogic;
8 use App\Http\Requests\Aside\Ai\AiCommandRequest; 8 use App\Http\Requests\Aside\Ai\AiCommandRequest;
9 -use App\Models\AiCommand as AiCommandModel; 9 +use App\Models\Ai\AiCommand as AiCommandModel;
10 use Illuminate\Http\Request; 10 use Illuminate\Http\Request;
11 use function App\Helper\send_openai_msg; 11 use function App\Helper\send_openai_msg;
12 12
@@ -22,7 +22,7 @@ class AiCommandController extends BaseController @@ -22,7 +22,7 @@ class AiCommandController extends BaseController
22 * @method 22 * @method
23 */ 23 */
24 public function lists(AiCommandModel $aiCommandModel){ 24 public function lists(AiCommandModel $aiCommandModel){
25 - $lists = $aiCommandModel->lists($this->map); 25 + $lists = $aiCommandModel->lists($this->map,$this->page,$this->row,$this->order);
26 $this->response('success',Code::SUCCESS,$lists); 26 $this->response('success',Code::SUCCESS,$lists);
27 } 27 }
28 28
@@ -75,8 +75,8 @@ class AiCommandController extends BaseController @@ -75,8 +75,8 @@ class AiCommandController extends BaseController
75 * @author :liyuhang 75 * @author :liyuhang
76 * @method 76 * @method
77 */ 77 */
78 - public function del(Request $request,AiCommandLogic $aiCommandLogic){  
79 - $request->validate([ 78 + public function del(AiCommandLogic $aiCommandLogic){
  79 + $this->request->validate([
80 'id'=>'required' 80 'id'=>'required'
81 ],[ 81 ],[
82 'id.required' => 'ID不能为空' 82 'id.required' => 'ID不能为空'
  1 +<?php
  2 +
  3 +namespace App\Http\Controllers\Aside\Ai;
  4 +
  5 +use App\Enums\Common\Code;
  6 +use App\Http\Controllers\Aside\BaseController;
  7 +use App\Models\Ai\AiLog as AiLogModel;
  8 +
  9 +
  10 +class AiLogController extends BaseController
  11 +{
  12 + /**
  13 + * @name :ai日志列表
  14 + * @return void
  15 + * @author :liyuhang
  16 + * @method
  17 + */
  18 + public function lists(AiLogModel $aiLogModel){
  19 + $lists = $aiLogModel->lists($this->map,$this->page,$this->row,$this->order);
  20 + $this->response('success',Code::SUCCESS,$lists);
  21 + }
  22 +}
@@ -34,10 +34,12 @@ class BaseController extends Controller @@ -34,10 +34,12 @@ class BaseController extends Controller
34 $info = Cache::get($this->token); 34 $info = Cache::get($this->token);
35 $this->user = $info; 35 $this->user = $info;
36 $this->uid = $info['id']; 36 $this->uid = $info['id'];
37 - } 37 + //参数处理
38 $this->get_param(); 38 $this->get_param();
39 } 39 }
40 40
  41 + }
  42 +
41 43
42 /** 44 /**
43 * 成功返回 45 * 成功返回
1 <?php 1 <?php
2 2
3 -namespace App\Http\Controllers\Aside; 3 +namespace App\Http\Controllers\Aside\Mail;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
  6 +use App\Http\Controllers\Aside\BaseController;
  7 +use App\Http\Logic\Aside\Mail\MailLogic;
  8 +use App\Http\Requests\Aside\Mail\MailRequest;
6 use App\Models\Mail\Mail as MailModel; 9 use App\Models\Mail\Mail as MailModel;
7 10
8 /** 11 /**
@@ -17,13 +20,32 @@ class MailController extends BaseController @@ -17,13 +20,32 @@ class MailController extends BaseController
17 } 20 }
18 21
19 /** 22 /**
20 - * @name :添加站内信 23 + * @name :详情
21 * @return void 24 * @return void
22 * @author :liyuhang 25 * @author :liyuhang
23 * @method 26 * @method
24 */ 27 */
25 - public function add(){ 28 + public function info(MailLogic $mailLogic){
  29 + $this->request->validate([
  30 + 'id'=>'required'
  31 + ],[
  32 + 'id.required' => 'ID不能为空'
  33 + ]);
  34 + $info = $mailLogic->mail_info();
  35 + $this->response('success',Code::SUCCESS,$info);
  36 + }
  37 +
26 38
  39 + /**
  40 + * @name :添加站内信
  41 + * @return void
  42 + * @author :liyuhang
  43 + * @method
  44 + */
  45 + public function add(MailRequest $mailRequest,MailLogic $mailLogic){
  46 + $mailRequest->validated();
  47 + $mailLogic->mail_add();
  48 + $this->response('success');
27 } 49 }
28 50
29 /** 51 /**
@@ -32,16 +54,29 @@ class MailController extends BaseController @@ -32,16 +54,29 @@ class MailController extends BaseController
32 * @author :liyuhang 54 * @author :liyuhang
33 * @method 55 * @method
34 */ 56 */
35 - public function edit(){  
36 - 57 + public function edit(MailRequest $mailRequest,MailLogic $mailLogic){
  58 + $mailRequest->validate([
  59 + 'id'=>'required'
  60 + ],[
  61 + 'id.required' => 'ID不能为空'
  62 + ]);
  63 + $mailLogic->mail_edit();
  64 + $this->response('success');
37 } 65 }
  66 +
38 /** 67 /**
39 * @name :逻辑删除站内信 68 * @name :逻辑删除站内信
40 * @return void 69 * @return void
41 * @author :liyuhang 70 * @author :liyuhang
42 * @method 71 * @method
43 */ 72 */
44 - public function del(){  
45 - 73 + public function del(MailLogic $mailLogic){
  74 + $this->request->validate([
  75 + 'id'=>'required'
  76 + ],[
  77 + 'id.required' => 'ID不能为空'
  78 + ]);
  79 + $mailLogic->mail_del();
  80 + $this->response('success');
46 } 81 }
47 } 82 }
@@ -2,14 +2,17 @@ @@ -2,14 +2,17 @@
2 2
3 namespace App\Http\Controllers\Aside\User; 3 namespace App\Http\Controllers\Aside\User;
4 4
  5 +use App\Enums\Common\Code;
5 use App\Http\Controllers\Aside\BaseController; 6 use App\Http\Controllers\Aside\BaseController;
  7 +use App\Models\ProjectGroup as ProjectGroupModel;
6 8
7 class ProjectGroupController extends BaseController 9 class ProjectGroupController extends BaseController
8 { 10 {
9 /** 11 /**
10 * @name:用户组列表 12 * @name:用户组列表
11 */ 13 */
12 - public function lists(){  
13 - 14 + public function lists(ProjectGroupModel $projectGroupModel){
  15 + $lists = $projectGroupModel->lists($this->map,$this->page,$this->row,$this->order);
  16 + $this->response('success',Code::SUCCESS,$lists);
14 } 17 }
15 } 18 }
1 <?php 1 <?php
2 2
3 -namespace App\Http\Controllers\Bside; 3 +namespace App\Http\Controllers\Bside\Ai;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 use App\Helper\Common; 6 use App\Helper\Common;
7 -use Illuminate\Http\Request; 7 +use App\Http\Controllers\Bside\BaseController;
  8 +use App\Http\Controllers\Bside\：写入日志;
  9 +use App\Models\Ai\AiLog;
8 10
9 class AiCommandController extends BaseController 11 class AiCommandController extends BaseController
10 { 12 {
@@ -15,8 +17,8 @@ class AiCommandController extends BaseController @@ -15,8 +17,8 @@ class AiCommandController extends BaseController
15 * @author :liyuhang 17 * @author :liyuhang
16 * @method 18 * @method
17 */ 19 */
18 - public function ai_http_post(Request $request){  
19 - $request->validate([ 20 + public function ai_http_post(){
  21 + $this->request->validate([
20 'keywords'=>['required'], 22 'keywords'=>['required'],
21 'key'=>['required'] 23 'key'=>['required']
22 ],[ 24 ],[
@@ -24,7 +26,25 @@ class AiCommandController extends BaseController @@ -24,7 +26,25 @@ class AiCommandController extends BaseController
24 'key.required' => '场景不能为空', 26 'key.required' => '场景不能为空',
25 ]); 27 ]);
26 #TODO 通过key获取到ai指令对象 28 #TODO 通过key获取到ai指令对象
27 - $data = Common::send_openai_msg($this->chat_url); 29 + $data = Common::send_openai_msg($this->chat_url,$this->param);
  30 + $this->set_ai_log($data);
28 $this->response('success',Code::SUCCESS,$data); 31 $this->response('success',Code::SUCCESS,$data);
29 } 32 }
  33 +
  34 + /**
  35 + * @name ：写入日志
  36 + * @return void
  37 + * @author :liyuhang
  38 + * @method
  39 + */
  40 + public function set_ai_log($data){
  41 + //写入日志
  42 + $param = [
  43 + 'key'=> $this->param['key'],
  44 + 'keywords'=>$this->param['key'],
  45 + 'remark' =>$data
  46 + ];
  47 + $aiLog = new AiLog();
  48 + return $aiLog->add($param);
  49 + }
30 } 50 }
@@ -39,26 +39,10 @@ class BaseController extends Controller @@ -39,26 +39,10 @@ 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();  
44 } 42 }
45 -  
46 } 43 }
47 44
48 /** 45 /**
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 - /**  
62 * @name 参数过滤 46 * @name 参数过滤
63 * @return void 47 * @return void
64 * @author :liyuhang 48 * @author :liyuhang
@@ -178,7 +162,7 @@ class BaseController extends Controller @@ -178,7 +162,7 @@ class BaseController extends Controller
178 break; 162 break;
179 case 'operator_id': 163 case 'operator_id':
180 if(!empty($v)){ 164 if(!empty($v)){
181 - $name = $this->get_name(['operator_id'=>$v]); 165 + $name = (new UserModel())->read(['operator_id'=>$v],['id','name']);
182 $data['operator_name'] = (isset($name['name']) && !empty($name['name'])) ? $name['name'] : '无名称'; 166 $data['operator_name'] = (isset($name['name']) && !empty($name['name'])) ? $name['name'] : '无名称';
183 } 167 }
184 break; 168 break;
@@ -187,17 +171,7 @@ class BaseController extends Controller @@ -187,17 +171,7 @@ class BaseController extends Controller
187 } 171 }
188 return $data; 172 return $data;
189 } 173 }
190 - /**  
191 - * @name :获取操作人名称  
192 - * @return void  
193 - * @author :liyuhang  
194 - * @method  
195 - */  
196 - public function get_name($data){  
197 - $user = new UserModel();  
198 - $info = $user->read($data,['id','name']);  
199 - return $info;  
200 - } 174 +
201 /** 175 /**
202 * @name :写入操作日志 176 * @name :写入操作日志
203 * @return void 177 * @return void
@@ -212,5 +186,6 @@ class BaseController extends Controller @@ -212,5 +186,6 @@ class BaseController extends Controller
212 Common::set_user_log(['model'=>$this->request->route()->getName(),'remark'=>'请求的参数：param = '.json_encode($this->param),'operator_id'=>$this->uid]); 186 Common::set_user_log(['model'=>$this->request->route()->getName(),'remark'=>'请求的参数：param = '.json_encode($this->param),'operator_id'=>$this->uid]);
213 } 187 }
214 } 188 }
  189 + return true;
215 } 190 }
216 } 191 }
@@ -6,9 +6,7 @@ use App\Enums\Common\Code; @@ -6,9 +6,7 @@ use App\Enums\Common\Code;
6 use App\Http\Controllers\Bside\BaseController; 6 use App\Http\Controllers\Bside\BaseController;
7 use App\Http\Logic\Bside\Blog\BlogCategoryLogic; 7 use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
8 use App\Http\Requests\Bside\Blog\BlogCategoryRequest; 8 use App\Http\Requests\Bside\Blog\BlogCategoryRequest;
9 -use App\Models\Blog\Blog as BlogModel;  
10 use App\Models\Blog\BlogCategory as BlogCategoryModel; 9 use App\Models\Blog\BlogCategory as BlogCategoryModel;
11 -use Illuminate\Http\Request;  
12 10
13 class BlogCategoryController extends BaseController 11 class BlogCategoryController extends BaseController
14 { 12 {
@@ -31,8 +29,8 @@ class BlogCategoryController extends BaseController @@ -31,8 +29,8 @@ class BlogCategoryController extends BaseController
31 * @author :liyuhang 29 * @author :liyuhang
32 * @method 30 * @method
33 */ 31 */
34 - public function info(Request $request,BlogCategoryLogic $blogCategoryLogic){  
35 - $request->validate([ 32 + public function info(BlogCategoryLogic $blogCategoryLogic){
  33 + $this->request->validate([
36 'id'=>['required'] 34 'id'=>['required']
37 ],[ 35 ],[
38 'id.required' => 'ID不能为空' 36 'id.required' => 'ID不能为空'
@@ -76,8 +74,8 @@ class BlogCategoryController extends BaseController @@ -76,8 +74,8 @@ class BlogCategoryController extends BaseController
76 * @author :liyuhang 74 * @author :liyuhang
77 * @method 75 * @method
78 */ 76 */
79 - public function status(Request $request,BlogCategoryLogic $blogCategoryLogic){  
80 - $request->validate([ 77 + public function status(BlogCategoryLogic $blogCategoryLogic){
  78 + $this->request->validate([
81 'id'=>['required'], 79 'id'=>['required'],
82 ],[ 80 ],[
83 'id.required' => 'ID不能为空', 81 'id.required' => 'ID不能为空',
@@ -92,8 +90,8 @@ class BlogCategoryController extends BaseController @@ -92,8 +90,8 @@ class BlogCategoryController extends BaseController
92 * @author :liyuhang 90 * @author :liyuhang
93 * @method 91 * @method
94 */ 92 */
95 - public function del(Request $request,BlogCategoryLogic $blogCategoryLogic){  
96 - $request->validate([ 93 + public function del(BlogCategoryLogic $blogCategoryLogic){
  94 + $this->request->validate([
97 'id'=>['required'], 95 'id'=>['required'],
98 ],[ 96 ],[
99 'id.required' => 'ID不能为空', 97 'id.required' => 'ID不能为空',
@@ -3,13 +3,13 @@ @@ -3,13 +3,13 @@
3 namespace App\Http\Controllers\Bside\Blog; 3 namespace App\Http\Controllers\Bside\Blog;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 -use App\Helper\Common;  
7 use App\Http\Controllers\Bside\BaseController; 6 use App\Http\Controllers\Bside\BaseController;
8 use App\Http\Logic\Bside\Blog\BlogCategoryLogic; 7 use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
  8 +use App\Http\Logic\Bside\Blog\BlogLabelLogic;
9 use App\Http\Logic\Bside\Blog\BlogLogic; 9 use App\Http\Logic\Bside\Blog\BlogLogic;
10 use App\Http\Requests\Bside\Blog\BlogRequest; 10 use App\Http\Requests\Bside\Blog\BlogRequest;
11 use App\Models\Blog\Blog as BlogModel; 11 use App\Models\Blog\Blog as BlogModel;
12 -use Illuminate\Http\Request; 12 +
13 class BlogController extends BaseController 13 class BlogController extends BaseController
14 { 14 {
15 /** 15 /**
@@ -18,7 +18,7 @@ class BlogController extends BaseController @@ -18,7 +18,7 @@ class BlogController extends BaseController
18 * @author :liyuhang 18 * @author :liyuhang
19 * @method 19 * @method
20 */ 20 */
21 - public function lists(BlogModel $blogModel,BlogCategoryLogic $blogCategoryLogic){ 21 + public function lists(BlogModel $blogModel,BlogCategoryLogic $blogCategoryLogic,BlogLabelLogic $blogLabelLogic){
22 //搜索条件 22 //搜索条件
23 $this->map['project_id'] = $this->user['project_id']; 23 $this->map['project_id'] = $this->user['project_id'];
24 $lists = $blogModel->lists($this->map,$this->page,$this->row,$this->order); 24 $lists = $blogModel->lists($this->map,$this->page,$this->row,$this->order);
@@ -26,6 +26,8 @@ class BlogController extends BaseController @@ -26,6 +26,8 @@ class BlogController extends BaseController
26 foreach ($lists['list'] as $k => $v){ 26 foreach ($lists['list'] as $k => $v){
27 //获取分类名称 27 //获取分类名称
28 $v = $blogCategoryLogic->get_category_name($v); 28 $v = $blogCategoryLogic->get_category_name($v);
  29 + //获取标签名称
  30 + $v = $blogLabelLogic->get_label_name($v);
29 $lists['list'][$k] = $v; 31 $lists['list'][$k] = $v;
30 } 32 }
31 } 33 }
@@ -49,8 +51,8 @@ class BlogController extends BaseController @@ -49,8 +51,8 @@ class BlogController extends BaseController
49 * @author :liyuhang 51 * @author :liyuhang
50 * @method 52 * @method
51 */ 53 */
52 - public function info(Request $request,BlogLogic $blogLogic){  
53 - $request->validate([ 54 + public function info(BlogLogic $blogLogic){
  55 + $this->request->validate([
54 'id'=>['required'] 56 'id'=>['required']
55 ],[ 57 ],[
56 'id.required' => 'ID不能为空' 58 'id.required' => 'ID不能为空'
@@ -94,8 +96,8 @@ class BlogController extends BaseController @@ -94,8 +96,8 @@ class BlogController extends BaseController
94 * @author :liyuhang 96 * @author :liyuhang
95 * @method 97 * @method
96 */ 98 */
97 - public function edit_seo(Request $request,BlogLogic $blogLogic){  
98 - $request->validate([ 99 + public function edit_seo(BlogLogic $blogLogic){
  100 + $this->request->validate([
99 'id'=>['required'], 101 'id'=>['required'],
100 'seo_title'=>['required'], 102 'seo_title'=>['required'],
101 'seo_description'=>['required'], 103 'seo_description'=>['required'],
@@ -115,8 +117,8 @@ class BlogController extends BaseController @@ -115,8 +117,8 @@ class BlogController extends BaseController
115 * @author :liyuhang 117 * @author :liyuhang
116 * @method 118 * @method
117 */ 119 */
118 - public function status(Request $request,BlogLogic $blogLogic){  
119 - $request->validate([ 120 + public function status(BlogLogic $blogLogic){
  121 + $this->request->validate([
120 'id'=>['required'], 122 'id'=>['required'],
121 ],[ 123 ],[
122 'id.required' => 'ID不能为空', 124 'id.required' => 'ID不能为空',
@@ -132,8 +134,8 @@ class BlogController extends BaseController @@ -132,8 +134,8 @@ class BlogController extends BaseController
132 * @author :liyuhang 134 * @author :liyuhang
133 * @method 135 * @method
134 */ 136 */
135 - public function del(Request $request,BlogLogic $blogLogic){  
136 - $request->validate([ 137 + public function del(BlogLogic $blogLogic){
  138 + $this->request->validate([
137 'id'=>['required'], 139 'id'=>['required'],
138 ],[ 140 ],[
139 'id.required' => 'ID不能为空', 141 'id.required' => 'ID不能为空',
@@ -141,24 +143,5 @@ class BlogController extends BaseController @@ -141,24 +143,5 @@ class BlogController extends BaseController
141 $blogLogic->blog_del(); 143 $blogLogic->blog_del();
142 $this->response('success'); 144 $this->response('success');
143 } 145 }
144 - /**  
145 - * @name :ai生成  
146 - * @return void  
147 - * @author :liyuhang  
148 - * @method  
149 - */  
150 - public function ai_blog(Request $request){  
151 - $request->validate([  
152 - 'keywords'=>['required'],  
153 - 'key'=>['required']  
154 - ],[  
155 - 'keywords.required' => '关键字不能为空',  
156 - 'key.required' => '场景不能为空',  
157 - ]);  
158 - #TODO 通过key获取到ai指令对象  
159 - $url = 'v2/openai_chat';  
160 - $data = Common::send_openai_msg($url);  
161 - $this->response('success',Code::SUCCESS,$data);  
162 - }  
163 146
164 } 147 }
@@ -59,13 +59,13 @@ class BlogLabelController extends BaseController @@ -59,13 +59,13 @@ 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不能为空',
67 ]); 67 ]);
68 - $blogLabelLogic->edit_blog_label(); 68 + $blogLabelLogic->status_blog_label();
69 //TODO::写入日志 69 //TODO::写入日志
70 $this->response('success'); 70 $this->response('success');
71 } 71 }
@@ -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 ],[
1 <?php 1 <?php
2 2
3 -namespace App\Http\Controllers\Bside; 3 +namespace App\Http\Controllers\Bside\Mail;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 -use App\Http\Logic\Bside\MailLogic; 6 +use App\Http\Controllers\Bside\BaseController;
  7 +use App\Http\Logic\Bside\Mail\MailLogic;
7 use App\Models\Mail\Mail as MailModel; 8 use App\Models\Mail\Mail as MailModel;
8 use App\Models\Mail\MailUser as MailUserModel; 9 use App\Models\Mail\MailUser as MailUserModel;
9 -use Illuminate\Http\Request;  
10 10
11 class MailController extends BaseController 11 class MailController extends BaseController
12 { 12 {
@@ -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);  
163 - $this->response('success',Code::SUCCESS,$data);  
164 - }  
165 -  
166 } 145 }
@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Bside\User; @@ -4,8 +4,8 @@ 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\Controllers\Bside\BaseController;
7 -use App\Http\Logic\Bside\DeptLogic;  
8 -use App\Http\Requests\Bside\DeptRequest; 7 +use App\Http\Logic\Bside\User\DeptLogic;
  8 +use App\Http\Requests\Bside\User\DeptRequest;
9 use App\Rules\Ids; 9 use App\Rules\Ids;
10 use Illuminate\Http\Request; 10 use Illuminate\Http\Request;
11 11
@@ -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不能为空'
@@ -7,6 +7,7 @@ use App\Http\Controllers\Bside\BaseController; @@ -7,6 +7,7 @@ use App\Http\Controllers\Bside\BaseController;
7 use App\Http\Controllers\Bside\Ids; 7 use App\Http\Controllers\Bside\Ids;
8 use App\Http\Controllers\Bside\json; 8 use App\Http\Controllers\Bside\json;
9 use App\Http\Logic\Bside\ProjectGroupLogic; 9 use App\Http\Logic\Bside\ProjectGroupLogic;
  10 +use App\Http\Logic\Bside\User\GroupLogic;
10 use App\Http\Requests\Bside\User\ProjectGroupRequest; 11 use App\Http\Requests\Bside\User\ProjectGroupRequest;
11 use App\Models\ProjectGroup as ProjectGroupModel; 12 use App\Models\ProjectGroup as ProjectGroupModel;
12 use App\Models\User\User as UserModel; 13 use App\Models\User\User as UserModel;
@@ -36,16 +37,13 @@ class ProjectGroupController extends BaseController @@ -36,16 +37,13 @@ class ProjectGroupController extends BaseController
36 * @author :liyuhang 37 * @author :liyuhang
37 * @method 38 * @method
38 */ 39 */
39 - public function info(Request $request,ProjectGroupModel $projectGroupModel){  
40 - $request->validate([ 40 + public function info(GroupLogic $groupLogic){
  41 + $this->request->validate([
41 'id'=>['required', new Ids()], 42 'id'=>['required', new Ids()],
42 ],[ 43 ],[
43 'id.required' => 'ID不能为空', 44 'id.required' => 'ID不能为空',
44 ]); 45 ]);
45 - $rs = $projectGroupModel->read($this->param);  
46 - if($rs === false){  
47 - $this->response('error',Code::USER_ERROR);  
48 - } 46 + $groupLogic->group_info();
49 $this->response('success'); 47 $this->response('success');
50 } 48 }
51 /** 49 /**
@@ -54,10 +52,8 @@ class ProjectGroupController extends BaseController @@ -54,10 +52,8 @@ class ProjectGroupController extends BaseController
54 * @author :liyuhang 52 * @author :liyuhang
55 * @method 53 * @method
56 */ 54 */
57 - public function get_user_lists(UserModel $userModel){  
58 - $this->map['project_id'] = $this->user['project_id'];  
59 - //获取当前项目下的所有用户  
60 - $lists = $userModel->list($this->map); 55 + public function get_user_lists(GroupLogic $groupLogic){
  56 + $lists = $groupLogic->user_list();
61 $this->response('success',Code::SUCCESS,$lists); 57 $this->response('success',Code::SUCCESS,$lists);
62 } 58 }
63 /** 59 /**
@@ -68,18 +64,9 @@ class ProjectGroupController extends BaseController @@ -68,18 +64,9 @@ class ProjectGroupController extends BaseController
68 * @author :liyuhang 64 * @author :liyuhang
69 * @method 65 * @method
70 */ 66 */
71 - public function add(ProjectGroupRequest $request,ProjectGroupModel $projectGroupModel){ 67 + public function add(ProjectGroupRequest $request,GroupLogic $groupLogic){
72 $request->validated(); 68 $request->validated();
73 - $this->param['project_id'] = $this->user['project_id'];  
74 - //TODO::成员列表：user_list  
75 - if(!isset($this->param['user_list']) || empty($this->param['user_list'])){  
76 - $this->param['user_list'] = $this->uid;  
77 - }  
78 - $this->param['admin_id'] = $this->uid;  
79 - $rs = $projectGroupModel->add($this->param);  
80 - if($rs === false){  
81 - $this->response('error',Code::USER_ERROR);  
82 - } 69 + $groupLogic->group_add($this->param);
83 $this->response('success'); 70 $this->response('success');
84 } 71 }
85 72
@@ -91,16 +78,13 @@ class ProjectGroupController extends BaseController @@ -91,16 +78,13 @@ class ProjectGroupController extends BaseController
91 * @author :liyuhang 78 * @author :liyuhang
92 * @method 79 * @method
93 */ 80 */
94 - public function edit(ProjectGroupRequest $request,ProjectGroupModel $projectGroupModel){ 81 + public function edit(ProjectGroupRequest $request,GroupLogic $groupLogic){
95 $request->validate([ 82 $request->validate([
96 'id'=>['required'], 83 'id'=>['required'],
97 ],[ 84 ],[
98 'id.required' => 'ID不能为空', 85 'id.required' => 'ID不能为空',
99 ]); 86 ]);
100 - $rs = $projectGroupModel->edit($this->param,['id'=>$this->param['id']]);  
101 - if($rs === false){  
102 - $this->response('error',Code::USER_ERROR);  
103 - } 87 + $groupLogic->group_edit();
104 $this->response('success'); 88 $this->response('success');
105 } 89 }
106 90
@@ -110,16 +94,13 @@ class ProjectGroupController extends BaseController @@ -110,16 +94,13 @@ class ProjectGroupController extends BaseController
110 * @author :liyuhang 94 * @author :liyuhang
111 * @method 95 * @method
112 */ 96 */
113 - public function del(Request $request,ProjectGroupModel $projectGroupModel){  
114 - $request->validate([ 97 + public function del(GroupLogic $groupLogic){
  98 + $this->request->validate([
115 'id'=>['required'], 99 'id'=>['required'],
116 ],[ 100 ],[
117 'id.required' => 'ID不能为空', 101 'id.required' => 'ID不能为空',
118 ]); 102 ]);
119 - $rs = $projectGroupModel->del($this->param);  
120 - if($rs === false){  
121 - $this->response('error',Code::USER_ERROR);  
122 - } 103 + $groupLogic->group_del($this->param);
123 $this->response('success'); 104 $this->response('success');
124 } 105 }
125 } 106 }
@@ -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 -}  
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 namespace App\Http\Logic\Aside\Ai; 3 namespace App\Http\Logic\Aside\Ai;
4 4
5 use App\Http\Logic\Aside\BaseLogic; 5 use App\Http\Logic\Aside\BaseLogic;
6 -use App\Models\AiCommand as AiCommandModel; 6 +use App\Models\Ai\AiCommand as AiCommandModel;
7 7
8 class AiCommandLogic extends BaseLogic 8 class AiCommandLogic extends BaseLogic
9 { 9 {
@@ -22,6 +22,10 @@ class AiCommandLogic extends BaseLogic @@ -22,6 +22,10 @@ class AiCommandLogic extends BaseLogic
22 * @method 22 * @method
23 */ 23 */
24 public function ai_info(){ 24 public function ai_info(){
  25 + $info = $this->model->read($this->param);
  26 + if($info !== false){
  27 + $this->fail('当前数据不存在');
  28 + }
25 return $this->success(); 29 return $this->success();
26 } 30 }
27 31
@@ -32,6 +36,17 @@ class AiCommandLogic extends BaseLogic @@ -32,6 +36,17 @@ class AiCommandLogic extends BaseLogic
32 * @method 36 * @method
33 */ 37 */
34 public function ai_add(){ 38 public function ai_add(){
  39 + $condition = [
  40 + 'key'=>$this->param['key']
  41 + ];
  42 + $info = $this->model->read($condition);
  43 + if($info !== false){
  44 + $this->fail('当前指令已存在');
  45 + }
  46 + $rs = $this->model->add($this->param);
  47 + if($rs === false){
  48 + $this->fail('error');
  49 + }
35 return $this->success(); 50 return $this->success();
36 } 51 }
37 52
@@ -42,6 +57,18 @@ class AiCommandLogic extends BaseLogic @@ -42,6 +57,18 @@ class AiCommandLogic extends BaseLogic
42 * @method 57 * @method
43 */ 58 */
44 public function ai_edit(){ 59 public function ai_edit(){
  60 + $condition = [
  61 + 'id'=>['!=',$this->param['id']],
  62 + 'key'=>$this->param['key']
  63 + ];
  64 + $info = $this->model->read($condition);
  65 + if($info !== false){
  66 + $this->fail('当前编辑的指令key已存在');
  67 + }
  68 + $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
  69 + if($rs === false){
  70 + $this->fail('error');
  71 + }
45 return $this->success(); 72 return $this->success();
46 } 73 }
47 74
@@ -52,6 +79,11 @@ class AiCommandLogic extends BaseLogic @@ -52,6 +79,11 @@ class AiCommandLogic extends BaseLogic
52 * @method 79 * @method
53 */ 80 */
54 public function ai_del(){ 81 public function ai_del(){
  82 + $this->param['id'] = ['in',$this->param['id']];
  83 + $rs = $this->model->del($this->param);
  84 + if($rs === false){
  85 + $this->fail('error');
  86 + }
55 return $this->success(); 87 return $this->success();
56 } 88 }
57 } 89 }
  1 +<?php
  2 +
  3 +namespace App\Http\Logic\Aside\Mail;
  4 +
  5 +use App\Http\Logic\Aside\BaseLogic;
  6 +use App\Models\Mail\Mail as MailModel;
  7 +
  8 +class MailLogic extends BaseLogic
  9 +{
  10 + public function __construct()
  11 + {
  12 + parent::__construct();
  13 + $this->model = new MailModel();
  14 + $this->param = $this->requestAll;
  15 + }
  16 +
  17 + /**
  18 + * @name :获取详情
  19 + * @return void
  20 + * @author :liyuhang
  21 + * @method
  22 + */
  23 + public function mail_info(){
  24 + $info = $this->model->read($this->param);
  25 + if($info === false){
  26 + $this->fail('当前数据不存在');
  27 + }
  28 + return $this->success($info);
  29 + }
  30 + /**
  31 + * @name :添加会员
  32 + * @return void
  33 + * @author :liyuhang
  34 + * @method
  35 + */
  36 + public function mail_add(){
  37 + $rs = $this->model->add($this->param);
  38 + if($rs === false){
  39 + $this->fail('添加失败');
  40 + }
  41 + return $this->success();
  42 + }
  43 +
  44 + /**
  45 + * @name :编辑会员
  46 + * @return void
  47 + * @author :liyuhang
  48 + * @method
  49 + */
  50 + public function mail_edit(){
  51 + $rs = $this->model->edit($this->param);
  52 + if($rs === false){
  53 + $this->fail('编辑失败');
  54 + }
  55 + return $this->success();
  56 + }
  57 +
  58 + /**
  59 + * @name :删除会员
  60 + * @return void
  61 + * @author :liyuhang
  62 + * @method
  63 + */
  64 + public function mail_del(){
  65 + $this->param['id'] = ['in',$this->param['id']];
  66 + $rs = $this->model->del($this->param);
  67 + if($rs === false){
  68 + $this->fail('删除失败');
  69 + }
  70 + return $this->success();
  71 + }
  72 +}
@@ -4,6 +4,7 @@ namespace App\Http\Logic\Bside; @@ -4,6 +4,7 @@ namespace App\Http\Logic\Bside;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 use App\Exceptions\BsideGlobalException; 6 use App\Exceptions\BsideGlobalException;
  7 +use App\Helper\Common;
7 use App\Http\Logic\Logic; 8 use App\Http\Logic\Logic;
8 use App\Models\Image as ImageModel; 9 use App\Models\Image as ImageModel;
9 use Illuminate\Http\Request; 10 use Illuminate\Http\Request;
@@ -89,6 +90,7 @@ class BaseLogic extends Logic @@ -89,6 +90,7 @@ class BaseLogic extends Logic
89 $map[] = ['project_id' => $this->user['project_id']]; 90 $map[] = ['project_id' => $this->user['project_id']];
90 return parent::delete($ids, $map); 91 return parent::delete($ids, $map);
91 } 92 }
  93 +
92 /** 94 /**
93 * @name :上传图片 95 * @name :上传图片
94 * @return void 96 * @return void
@@ -121,4 +123,5 @@ class BaseLogic extends Logic @@ -121,4 +123,5 @@ class BaseLogic extends Logic
121 } 123 }
122 return $hash.$filename; 124 return $hash.$filename;
123 } 125 }
  126 +
124 } 127 }
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Http\Logic\Bside\Blog; 3 namespace App\Http\Logic\Bside\Blog;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
  6 +use App\Helper\Common;
6 use App\Http\Logic\Bside\BaseLogic; 7 use App\Http\Logic\Bside\BaseLogic;
7 use App\Http\Logic\Bside\User\UserLogic; 8 use App\Http\Logic\Bside\User\UserLogic;
8 use App\Models\Blog\BlogCategory as BlogCategoryModel; 9 use App\Models\Blog\BlogCategory as BlogCategoryModel;
@@ -101,10 +102,7 @@ class BlogCategoryLogic extends BaseLogic @@ -101,10 +102,7 @@ class BlogCategoryLogic extends BaseLogic
101 $this->fail('当前分类名称已存在'); 102 $this->fail('当前分类名称已存在');
102 } 103 }
103 $this->param['operator_id'] = $this->user['id']; 104 $this->param['operator_id'] = $this->user['id'];
104 - $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);  
105 - if($rs === false){  
106 - $this->fail('error');  
107 - } 105 + $this->edit($this->param,$this->param['id']);
108 return $this->success(); 106 return $this->success();
109 } 107 }
110 108
@@ -115,10 +113,7 @@ class BlogCategoryLogic extends BaseLogic @@ -115,10 +113,7 @@ class BlogCategoryLogic extends BaseLogic
115 * @method 113 * @method
116 */ 114 */
117 public function info_blog_category(){ 115 public function info_blog_category(){
118 - $info = $this->model->read($this->param);  
119 - if($info === false){  
120 - $this->fail('error');  
121 - } 116 + $info = $this->info($this->param);
122 return $this->success($info); 117 return $this->success($info);
123 } 118 }
124 119
@@ -143,7 +138,8 @@ class BlogCategoryLogic extends BaseLogic @@ -143,7 +138,8 @@ class BlogCategoryLogic extends BaseLogic
143 * @method 138 * @method
144 */ 139 */
145 public function del_blog_category(){ 140 public function del_blog_category(){
146 - foreach ($this->param['id'] as $v){ 141 + $ids = $this->param['id'];
  142 + foreach ($ids as $v){
147 //查询是否有子分类 143 //查询是否有子分类
148 $rs = $this->model->read(['pid'=>$v],['id']); 144 $rs = $this->model->read(['pid'=>$v],['id']);
149 if($rs !== false){ 145 if($rs !== false){
@@ -157,10 +153,7 @@ class BlogCategoryLogic extends BaseLogic @@ -157,10 +153,7 @@ class BlogCategoryLogic extends BaseLogic
157 } 153 }
158 } 154 }
159 $this->param['id'] = ['in',$this->param['id']]; 155 $this->param['id'] = ['in',$this->param['id']];
160 - $rs = $this->model->del($this->param);  
161 - if($rs === false){  
162 - $this->response('error');  
163 - } 156 + $this->del($this->param,$ids);
164 return $this->success(); 157 return $this->success();
165 } 158 }
166 } 159 }
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Http\Logic\Bside\Blog; 3 namespace App\Http\Logic\Bside\Blog;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
  6 +use App\Helper\Common;
6 use App\Http\Logic\Bside\BaseLogic; 7 use App\Http\Logic\Bside\BaseLogic;
7 use App\Models\Blog\Blog as BlogModel; 8 use App\Models\Blog\Blog as BlogModel;
8 use App\Models\Blog\BlogLabel as BlogLabelModel; 9 use App\Models\Blog\BlogLabel as BlogLabelModel;
@@ -16,7 +17,23 @@ class BlogLabelLogic extends BaseLogic @@ -16,7 +17,23 @@ class BlogLabelLogic extends BaseLogic
16 $this->model = new BlogLabelModel(); 17 $this->model = new BlogLabelModel();
17 $this->param = $this->requestAll; 18 $this->param = $this->requestAll;
18 } 19 }
19 - 20 + /**
  21 + * @param $v
  22 + * @name :获取分类名称
  23 + * @return void
  24 + * @author :liyuhang
  25 + * @method
  26 + */
  27 + public function get_label_name($v){
  28 + //获取用户已读还是未读
  29 + $label_info = $this->model->list(['id'=>['in',explode(',',trim($v['label_id'],','))]],'id',['name']);
  30 + $str = '';
  31 + foreach ($label_info as $v1){
  32 + $str .= $v1['name'].',';
  33 + }
  34 + $v['label_name'] = trim($str,',');
  35 + return $this->success($v);
  36 + }
20 /** 37 /**
21 * @name :新增标签 38 * @name :新增标签
22 * @return void 39 * @return void
@@ -59,22 +76,30 @@ class BlogLabelLogic extends BaseLogic @@ -59,22 +76,30 @@ class BlogLabelLogic extends BaseLogic
59 $this->fail('当前标签名称已存在'); 76 $this->fail('当前标签名称已存在');
60 } 77 }
61 $this->param['operator_id'] = $this->user['id']; 78 $this->param['operator_id'] = $this->user['id'];
62 - $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);  
63 - //TODO::路由映射  
64 - if($rs === false){  
65 - $this->fail('error');  
66 - } 79 + $this->edit($this->param,['id'=>$this->param['id']]);
67 return $this->success(); 80 return $this->success();
68 } 81 }
69 82
70 /** 83 /**
  84 + * @name :编辑状态
  85 + * @return array
  86 + * @author :liyuhang
  87 + * @method
  88 + */
  89 + public function status_blog_label(){
  90 + $this->param['operator_id'] = $this->user['id'];
  91 + $this->edit($this->param,['id'=>$this->param['id']]);
  92 + return $this->success();
  93 + }
  94 + /**
71 * @name :删除标签 95 * @name :删除标签
72 * @return array 96 * @return array
73 * @author :liyuhang 97 * @author :liyuhang
74 * @method 98 * @method
75 */ 99 */
76 public function del_blog_label(){ 100 public function del_blog_label(){
77 - foreach ($this->param['id'] as $v){ 101 + $ids = $this->param['id'];
  102 + foreach ($ids as $v){
78 //查看当前分内下是否有博客 103 //查看当前分内下是否有博客
79 $blogModel = new BlogModel(); 104 $blogModel = new BlogModel();
80 $rs = $blogModel->read(['label_id'=>$v],['id']); 105 $rs = $blogModel->read(['label_id'=>$v],['id']);
@@ -83,10 +108,7 @@ class BlogLabelLogic extends BaseLogic @@ -83,10 +108,7 @@ class BlogLabelLogic extends BaseLogic
83 } 108 }
84 } 109 }
85 $this->param['id'] = ['in',$this->param['id']]; 110 $this->param['id'] = ['in',$this->param['id']];
86 - $rs = $this->model->del($this->param);  
87 - if($rs === false){  
88 - $this->fail('error');  
89 - } 111 + $this->del($this->param,$ids);
90 return $this->success(); 112 return $this->success();
91 } 113 }
92 } 114 }
@@ -68,7 +68,6 @@ class BlogLogic extends BaseLogic @@ -68,7 +68,6 @@ class BlogLogic extends BaseLogic
68 $this->param['project_id'] = $this->user['project_id']; 68 $this->param['project_id'] = $this->user['project_id'];
69 $this->param['created_at'] = date('Y-m-d H:i:s',time()); 69 $this->param['created_at'] = date('Y-m-d H:i:s',time());
70 $this->param['updated_at'] = date('Y-m-d H:i:s',time()); 70 $this->param['updated_at'] = date('Y-m-d H:i:s',time());
71 - $this->param['category_id'] = ','.$this->param['category_id'].',';  
72 DB::beginTransaction(); 71 DB::beginTransaction();
73 try { 72 try {
74 if(isset($this->param['image'])){ 73 if(isset($this->param['image'])){
@@ -101,7 +100,7 @@ class BlogLogic extends BaseLogic @@ -101,7 +100,7 @@ class BlogLogic extends BaseLogic
101 if($info !== false){ 100 if($info !== false){
102 $this->fail('当前名称已存在'); 101 $this->fail('当前名称已存在');
103 } 102 }
104 - $this->param['operator_id'] = $this->uid; 103 + $this->param['operator_id'] = $this->user['id'];
105 DB::beginTransaction(); 104 DB::beginTransaction();
106 try { 105 try {
107 if(isset($this->param['image']) && is_file($this->param['image'])){ 106 if(isset($this->param['image']) && is_file($this->param['image'])){
@@ -117,7 +116,7 @@ class BlogLogic extends BaseLogic @@ -117,7 +116,7 @@ class BlogLogic extends BaseLogic
117 $this->param['image'] = $this->upload(); 116 $this->param['image'] = $this->upload();
118 } 117 }
119 RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']); 118 RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
120 - $this->model->edit($this->param,['id'=>$this->param['id']]); 119 + $this->edit($this->param,['id'=>$this->param['id']]);
121 DB::commit(); 120 DB::commit();
122 }catch (\Exception $e){ 121 }catch (\Exception $e){
123 DB::rollBack(); 122 DB::rollBack();
@@ -137,6 +136,8 @@ class BlogLogic extends BaseLogic @@ -137,6 +136,8 @@ class BlogLogic extends BaseLogic
137 if($rs === false){ 136 if($rs === false){
138 $this->fail('error'); 137 $this->fail('error');
139 } 138 }
  139 + //清除缓存
  140 + Common::del_user_cache($this->model->getTable(),$this->param['id']);
140 return $this->success(); 141 return $this->success();
141 } 142 }
142 /** 143 /**
@@ -146,19 +147,22 @@ class BlogLogic extends BaseLogic @@ -146,19 +147,22 @@ class BlogLogic extends BaseLogic
146 * @method 147 * @method
147 */ 148 */
148 public function blog_info(){ 149 public function blog_info(){
  150 + //读取缓存
  151 + $info = Common::get_user_cache($this->model->getTable(),$this->param['id']);
  152 + if(empty($info)){
149 $info = $this->model->read($this->param); 153 $info = $this->model->read($this->param);
150 if($info === false){ 154 if($info === false){
151 $this->fail('error'); 155 $this->fail('error');
152 } 156 }
153 //获取分类名称 157 //获取分类名称
154 - $info['category_id'] = explode(',',trim($info['category_id'],','));  
155 - $blogCategoryModel = new BlogCategoryModel();  
156 - $category_list = $blogCategoryModel->list(['id'=>['in',$info['category_id']]],'id',['name']);  
157 - $str = '';  
158 - foreach ($category_list as $v){  
159 - $str .= $v['name'].','; 158 + $blogCategoryLogic = new BlogCategoryLogic();
  159 + $info = $blogCategoryLogic->get_category_name($info);
  160 + //获取标签名称
  161 + $blogLabelLogic = new BlogLabelLogic();
  162 + $info = $blogLabelLogic->get_label_name($info);
  163 + //写入缓存
  164 + Common::set_user_cache($info,$this->model->getTable(),$this->param['id']);
160 } 165 }
161 - $info['category_name'] = trim($str,',');  
162 return $this->success($info); 166 return $this->success($info);
163 } 167 }
164 168
@@ -185,11 +189,14 @@ class BlogLogic extends BaseLogic @@ -185,11 +189,14 @@ class BlogLogic extends BaseLogic
185 * @method 189 * @method
186 */ 190 */
187 public function blog_del(){ 191 public function blog_del(){
  192 + $ids = $this->param['id'];
188 $this->param['id'] = ['in',$this->param['id']]; 193 $this->param['id'] = ['in',$this->param['id']];
189 $rs = $this->model->del($this->param); 194 $rs = $this->model->del($this->param);
190 if($rs === false){ 195 if($rs === false){
191 $this->fail('error',Code::USER_ERROR); 196 $this->fail('error',Code::USER_ERROR);
192 } 197 }
  198 + //清除缓存
  199 + Common::del_user_cache($this->model->getTable(),$ids);
193 return $this->success(); 200 return $this->success();
194 } 201 }
195 202
1 -<?php  
2 -  
3 -namespace App\Http\Logic\Bside;  
4 -  
5 -use App\Models\ProjectGroup;  
6 -  
7 -class GroupLogic extends BaseLogic  
8 -{  
9 - public function __construct()  
10 - {  
11 - parent::__construct();  
12 -  
13 - $this->model = new ProjectGroup();  
14 - $this->param = $this->requestAll;  
15 - }  
16 -}  
1 <?php 1 <?php
2 2
3 -namespace App\Http\Logic\Bside; 3 +namespace App\Http\Logic\Bside\Mail;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
  6 +use App\Http\Logic\Bside\BaseLogic;
6 use App\Models\Mail\Mail as MailModel; 7 use App\Models\Mail\Mail as MailModel;
7 use App\Models\Mail\MailUser as MailUserModel; 8 use App\Models\Mail\MailUser as MailUserModel;
8 9
@@ -21,10 +22,7 @@ class MailLogic extends BaseLogic @@ -21,10 +22,7 @@ class MailLogic extends BaseLogic
21 * @author :liyuhang 22 * @author :liyuhang
22 */ 23 */
23 public function mail_info(){ 24 public function mail_info(){
24 - $info = $this->model->read($this->param);  
25 - if($info === false){  
26 - $this->fail('当前数据不存在',Code::USER_ERROR);  
27 - } 25 + $info = $this->info($this->param);
28 //生成一条阅读记录 26 //生成一条阅读记录
29 $mailUserModel = new MailUserModel(); 27 $mailUserModel = new MailUserModel();
30 $data = [ 28 $data = [
@@ -44,10 +44,7 @@ class NewsCategoryLogic extends BaseLogic @@ -44,10 +44,7 @@ class NewsCategoryLogic extends BaseLogic
44 * @method 44 * @method
45 */ 45 */
46 public function info_news_category(){ 46 public function info_news_category(){
47 - $info = $this->model->read($this->param);  
48 - if($info === false){  
49 - $this->fail('error',Code::USER_ERROR);  
50 - } 47 + $info = $this->info($this->param);
51 return $this->success($info); 48 return $this->success($info);
52 } 49 }
53 /** 50 /**
@@ -114,10 +111,7 @@ class NewsCategoryLogic extends BaseLogic @@ -114,10 +111,7 @@ class NewsCategoryLogic extends BaseLogic
114 $this->fail('当前分类名称已存在'); 111 $this->fail('当前分类名称已存在');
115 } 112 }
116 $this->param['operator_id'] = $this->user['id']; 113 $this->param['operator_id'] = $this->user['id'];
117 - $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);  
118 - if($rs === false){  
119 - $this->fail('error');  
120 - } 114 + $this->edit($this->param,['id'=>$this->param['id']]);
121 return $this->success(); 115 return $this->success();
122 } 116 }
123 117
@@ -130,10 +124,7 @@ class NewsCategoryLogic extends BaseLogic @@ -130,10 +124,7 @@ class NewsCategoryLogic extends BaseLogic
130 */ 124 */
131 public function status_news_category(){ 125 public function status_news_category(){
132 $this->param['operator_id'] = $this->user['id']; 126 $this->param['operator_id'] = $this->user['id'];
133 - $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);  
134 - if($rs === false){  
135 - $this->fail('error');  
136 - } 127 + $this->edit($this->param,['id'=>$this->param['id']]);
137 return $this->success(); 128 return $this->success();
138 } 129 }
139 /** 130 /**
@@ -144,6 +135,7 @@ class NewsCategoryLogic extends BaseLogic @@ -144,6 +135,7 @@ class NewsCategoryLogic extends BaseLogic
144 * @method 135 * @method
145 */ 136 */
146 public function del_news_category(){ 137 public function del_news_category(){
  138 + $ids = $this->param['id'];
147 foreach ($this->param['id'] as $v){ 139 foreach ($this->param['id'] as $v){
148 //查询是否有子分类 140 //查询是否有子分类
149 $rs = $this->model->read(['pid'=>$v],['id']); 141 $rs = $this->model->read(['pid'=>$v],['id']);
@@ -158,10 +150,7 @@ class NewsCategoryLogic extends BaseLogic @@ -158,10 +150,7 @@ class NewsCategoryLogic extends BaseLogic
158 } 150 }
159 } 151 }
160 $this->param['id'] = ['in',$this->param['id']]; 152 $this->param['id'] = ['in',$this->param['id']];
161 - $rs = $this->model->del($this->param);  
162 - if($rs === false){  
163 - $this->fail('error');  
164 - } 153 + $this->del($this->param,$ids);
165 return $this->success(); 154 return $this->success();
166 } 155 }
167 } 156 }
@@ -59,7 +59,6 @@ class NewsLogic extends BaseLogic @@ -59,7 +59,6 @@ class NewsLogic extends BaseLogic
59 $this->param['project_id'] = $this->user['project_id']; 59 $this->param['project_id'] = $this->user['project_id'];
60 $this->param['created_at'] = date('Y-m-d H:i:s',time()); 60 $this->param['created_at'] = date('Y-m-d H:i:s',time());
61 $this->param['updated_at'] = date('Y-m-d H:i:s',time()); 61 $this->param['updated_at'] = date('Y-m-d H:i:s',time());
62 - $this->param['category_id'] = ','.$this->param['category_id'].',';  
63 DB::beginTransaction(); 62 DB::beginTransaction();
64 try { 63 try {
65 if(isset($this->param['image'])){ 64 if(isset($this->param['image'])){
@@ -159,18 +158,14 @@ class NewsLogic extends BaseLogic @@ -159,18 +158,14 @@ class NewsLogic extends BaseLogic
159 * @method 158 * @method
160 */ 159 */
161 public function news_info(){ 160 public function news_info(){
  161 + //读取缓存
  162 + $info = Common::get_user_cache($this->model->getTable(),$this->param['id']);
  163 + if(empty($info)){
162 $info = $this->model->read($this->param); 164 $info = $this->model->read($this->param);
163 - //获取分类名称  
164 - $info['category_id'] = explode(',',trim($info['category_id'],','));  
165 - $newsCategoryModel = new NewsCategoryModel();  
166 - $category_list = $newsCategoryModel->list(['id'=>['in',$info['category_id']]],'id',['name']);  
167 - $str = '';  
168 - foreach ($category_list as $v){  
169 - $str .= $v['name'].',';  
170 - }  
171 - $info['category_id'] = trim($str,',');  
172 - if($info === false){  
173 - $this->fail('error'); 165 + $newsCategoryLogic = new NewsCategoryLogic();
  166 + $info = $newsCategoryLogic->get_category_name($info);
  167 + //写入缓存
  168 + Common::set_user_cache($info,$this->model->getTable(),$this->param['id']);
174 } 169 }
175 return $this->success($info); 170 return $this->success($info);
176 } 171 }
@@ -182,11 +177,9 @@ class NewsLogic extends BaseLogic @@ -182,11 +177,9 @@ class NewsLogic extends BaseLogic
182 * @method 177 * @method
183 */ 178 */
184 public function news_del(){ 179 public function news_del(){
  180 + $ids = $this->param['id'];
185 $this->param['id'] = ['in',$this->param['id']]; 181 $this->param['id'] = ['in',$this->param['id']];
186 - $rs = $this->model->del($this->param);  
187 - if($rs === false){  
188 - $this->fail('error');  
189 - } 182 + $this->del($this->param,$ids);
190 return $this->success(); 183 return $this->success();
191 } 184 }
192 } 185 }
1 <?php 1 <?php
2 2
3 -namespace App\Http\Logic\Bside; 3 +namespace App\Http\Logic\Bside\User;
4 4
5 use App\Helper\Arr; 5 use App\Helper\Arr;
  6 +use App\Http\Logic\Bside\BaseLogic;
6 use App\Models\ProjectDept; 7 use App\Models\ProjectDept;
7 8
8 /** 9 /**
  1 +<?php
  2 +
  3 +namespace App\Http\Logic\Bside\User;
  4 +
  5 +use App\Http\Logic\Bside\BaseLogic;
  6 +use App\Models\ProjectGroup;
  7 +
  8 +class GroupLogic extends BaseLogic
  9 +{
  10 + public function __construct()
  11 + {
  12 + parent::__construct();
  13 +
  14 + $this->model = new ProjectGroup();
  15 + $this->param = $this->requestAll;
  16 + }
  17 +
  18 + public function user_list(){
  19 + return $this->success();
  20 + }
  21 + /**
  22 + * @name :添加
  23 + * @return void
  24 + * @author :liyuhang
  25 + * @method
  26 + */
  27 + public function group_add(){
  28 + return $this->success();
  29 + }
  30 +
  31 + /**
  32 + * @name :编辑
  33 + * @return void
  34 + * @author :liyuhang
  35 + * @method
  36 + */
  37 + public function group_edit(){
  38 + return $this->success();
  39 + }
  40 +
  41 + /**
  42 + * @name :详情
  43 + * @return void
  44 + * @author :liyuhang
  45 + * @method
  46 + */
  47 + public function group_info(){
  48 + return $this->success();
  49 + }
  50 +
  51 + /**
  52 + * @name :删除
  53 + * @return void
  54 + * @author :liyuhang
  55 + * @method
  56 + */
  57 + public function group_del(){
  58 + return $this->success();
  59 + }
  60 +}
@@ -64,10 +64,7 @@ class RoleLogic extends BaseLogic @@ -64,10 +64,7 @@ class RoleLogic extends BaseLogic
64 if($info !== false){ 64 if($info !== false){
65 $this->fail('当前添加的角色已存在'); 65 $this->fail('当前添加的角色已存在');
66 } 66 }
67 - $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);  
68 - if($rs === false){  
69 - $this->fail('error');  
70 - } 67 + $this->edit($this->param,['id'=>$this->param['id']]);
71 return $this->success(); 68 return $this->success();
72 } 69 }
73 70
@@ -78,10 +75,7 @@ class RoleLogic extends BaseLogic @@ -78,10 +75,7 @@ class RoleLogic extends BaseLogic
78 * @method 75 * @method
79 */ 76 */
80 public function role_status(){ 77 public function role_status(){
81 - $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);  
82 - if($rs === false){  
83 - $this->fail('error',Code::USER_PARAMS_ERROE);  
84 - } 78 + $this->edit($this->param,['id'=>$this->param['id']]);
85 return $this->success(); 79 return $this->success();
86 } 80 }
87 81
@@ -100,11 +94,9 @@ class RoleLogic extends BaseLogic @@ -100,11 +94,9 @@ class RoleLogic extends BaseLogic
100 $this->fail('当前角色下有用户存在，不允许删除',Code::USER_ERROR); 94 $this->fail('当前角色下有用户存在，不允许删除',Code::USER_ERROR);
101 } 95 }
102 } 96 }
  97 + $ids = $this->param['id'];
103 $this->param['id'] = ['in',$this->param['id']]; 98 $this->param['id'] = ['in',$this->param['id']];
104 - $rs = $this->model->del($this->param);  
105 - if($rs === false){  
106 - $this->fail('error',Code::USER_ERROR);  
107 - } 99 + $this->del($this->param,$ids);
108 return $this->success(); 100 return $this->success();
109 } 101 }
110 102
@@ -115,10 +107,7 @@ class RoleLogic extends BaseLogic @@ -115,10 +107,7 @@ class RoleLogic extends BaseLogic
115 * @method 107 * @method
116 */ 108 */
117 public function role_info(){ 109 public function role_info(){
118 - $info = $this->model->read($this->param);  
119 - if($info === false){  
120 - $this->fail('error',Code::USER_ERROR);  
121 - } 110 + $info = $this->info($this->param);
122 return $this->success($info); 111 return $this->success($info);
123 } 112 }
124 113
@@ -24,10 +24,7 @@ class UserLogic extends BaseLogic @@ -24,10 +24,7 @@ class UserLogic extends BaseLogic
24 * @method 24 * @method
25 */ 25 */
26 public function user_info(){ 26 public function user_info(){
27 - $info = $this->model->read($this->param);  
28 - if($info === false){  
29 - $this->fail('error',Code::USER_ERROR);  
30 - } 27 + $info = $this->info($this->param);
31 return $this->success($info); 28 return $this->success($info);
32 } 29 }
33 /** 30 /**
@@ -111,11 +108,9 @@ class UserLogic extends BaseLogic @@ -111,11 +108,9 @@ class UserLogic extends BaseLogic
111 * @method 108 * @method
112 */ 109 */
113 public function user_del(){ 110 public function user_del(){
114 - $this->param['operator_id'] = $this->user['id'];  
115 - $rs = $this->model->edit(['status'=>2],['id'=>['in',$this->param['id']]]);  
116 - if($rs === false){  
117 - $this->fail('error',Code::USER_ERROR);  
118 - } 111 + $ids = $this->param['id'];
  112 + $this->param['id'] = ['in',$this->param['id']];
  113 + $this->del($this->param,$ids);
119 return $this->success(); 114 return $this->success();
120 } 115 }
121 116
@@ -4,6 +4,7 @@ namespace App\Http\Logic; @@ -4,6 +4,7 @@ namespace App\Http\Logic;
4 4
5 use App\Enums\Common\Code; 5 use App\Enums\Common\Code;
6 use App\Enums\Common\Common; 6 use App\Enums\Common\Common;
  7 +use \App\Helper\Common as CommonHelper;
7 use App\Exceptions\AsideGlobalException; 8 use App\Exceptions\AsideGlobalException;
8 use App\Exceptions\BsideGlobalException; 9 use App\Exceptions\BsideGlobalException;
9 use App\Helper\Arr; 10 use App\Helper\Arr;
@@ -330,4 +331,53 @@ class Logic @@ -330,4 +331,53 @@ class Logic
330 }); 331 });
331 return $query; 332 return $query;
332 } 333 }
  334 +
  335 +
  336 + /**
  337 + * @name :删除
  338 + * @return void
  339 + * @author :liyuhang
  340 + * @method
  341 + */
  342 + public function del($map,$ids){
  343 + $rs = $this->model->del($map);
  344 + if($rs === false){
  345 + $this->fail('error');
  346 + }
  347 + CommonHelper::del_user_cache($this->model->getTable(),$ids);
  348 + return $this->success();
  349 + }
  350 +
  351 + /**
  352 + * @name :编辑
  353 + * @return void
  354 + * @author :liyuhang
  355 + * @method
  356 + */
  357 + public function edit($map,$condition){
  358 + $rs = $this->model->edit($map,$condition);
  359 + if($rs === false){
  360 + $this->fail('error');
  361 + }
  362 + CommonHelper::del_user_cache($this->model->getTable(),$condition['id']);
  363 + return $this->success();
  364 + }
  365 +
  366 + /**
  367 + * @param $map
  368 + * @name :详情
  369 + * @author :liyuhang
  370 + * @method
  371 + */
  372 + public function info($map){
  373 + $info = CommonHelper::get_user_cache($this->model->getTable(),$map['id']);
  374 + if(empty($info)){
  375 + $info = $this->model->read($map);
  376 + if($info === false){
  377 + $this->fail('当前数据不存在');
  378 + }
  379 + CommonHelper::set_user_cache($info,$this->model->getTable(),$map['id']);
  380 + }
  381 + return $this->success($info);
  382 + }
333 } 383 }
@@ -33,9 +33,9 @@ class AiCommandRequest extends FormRequest @@ -33,9 +33,9 @@ class AiCommandRequest extends FormRequest
33 public function messages() 33 public function messages()
34 { 34 {
35 return [ 35 return [
36 - 'key.required'=>'指令不能为空', 36 + 'key.required'=>'key不能为空',
37 'scene.required' => '场景不能为空', 37 'scene.required' => '场景不能为空',
38 - 'ai.required'=>'指令不猛为空', 38 + 'ai.required'=>'指令你能为空',
39 ]; 39 ];
40 } 40 }
41 } 41 }
  1 +<?php
  2 +
  3 +namespace App\Http\Requests\Aside\Mail;
  4 +
  5 +use Illuminate\Foundation\Http\FormRequest;
  6 +
  7 +class MailRequest 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 + 'title'=>'required',
  28 + 'content'=>'required',
  29 + ];
  30 + }
  31 +
  32 + public function messages()
  33 + {
  34 + return [
  35 + 'title.required'=>'名称不能为空',
  36 + 'content.required' => '内容不能为空',
  37 + ];
  38 + }
  39 +}
1 <?php 1 <?php
2 2
3 -namespace App\Http\Requests\Bside; 3 +namespace App\Http\Requests\Bside\User;
4 4
5 use Illuminate\Foundation\Http\FormRequest; 5 use Illuminate\Foundation\Http\FormRequest;
6 6
1 <?php 1 <?php
2 2
3 -namespace App\Models; 3 +namespace App\Models\Ai;
  4 +
  5 +use App\Models\Base;
4 6
5 class AiCommand extends Base 7 class AiCommand extends Base
6 { 8 {
  1 +<?php
  2 +
  3 +namespace App\Models\Ai;
  4 +
  5 +use App\Models\Base;
  6 +
  7 +class AiLog extends Base
  8 +{
  9 + //设置关联表名
  10 + protected $table = 'gl_ai_log';
  11 + //自动维护create_at创建时间 updated_at修改时间
  12 + public $timestamps = true;
  13 +}
@@ -2,10 +2,8 @@ @@ -2,10 +2,8 @@
2 2
3 namespace App\Models; 3 namespace App\Models;
4 4
  5 +use App\Helper\Common;
5 use Illuminate\Database\Eloquent\Model; 6 use Illuminate\Database\Eloquent\Model;
6 -use Illuminate\Support\Facades\Cache;  
7 -use Illuminate\Support\Facades\DB;  
8 -  
9 class Base extends Model 7 class Base extends Model
10 { 8 {
11 protected $table = ''; 9 protected $table = '';
@@ -68,9 +66,10 @@ class Base extends Model @@ -68,9 +66,10 @@ class Base extends Model
68 * @author :liyuhang 66 * @author :liyuhang
69 * @method 67 * @method
70 */ 68 */
71 - public function lists($map, $page, $row, $order = 'id', $fields = ['*']){ 69 + public function lists($map, $page, $row, $order = 'id', $fields = ['*']): array
  70 + {
72 $query = $this->formatQuery($map); 71 $query = $this->formatQuery($map);
73 - $lists = $query->select($fields)->orderBy($order)->paginate($row, ['*'], 'page', $page); 72 + $lists = $query->select($fields)->orderBy($order,'desc')->paginate($row, ['*'], 'page', $page);
74 if (empty($lists)) { 73 if (empty($lists)) {
75 return []; 74 return [];
76 } 75 }
@@ -86,7 +85,8 @@ class Base extends Model @@ -86,7 +85,8 @@ class Base extends Model
86 * @author :liyuhang 85 * @author :liyuhang
87 * @method 86 * @method
88 */ 87 */
89 - public function list($map,$order = 'id',$fields = ['*']){ 88 + public function list($map,$order = 'id',$fields = ['*']): array
  89 + {
90 $query = $this->formatQuery($map); 90 $query = $this->formatQuery($map);
91 $lists = $query->select($fields)->orderBy($order)->get(); 91 $lists = $query->select($fields)->orderBy($order)->get();
92 if (empty($lists)) { 92 if (empty($lists)) {
@@ -133,6 +133,7 @@ class Base extends Model @@ -133,6 +133,7 @@ class Base extends Model
133 $query = $this->formatQuery($condition); 133 $query = $this->formatQuery($condition);
134 $data['updated_at'] = date('Y-m-d H:i:s'); 134 $data['updated_at'] = date('Y-m-d H:i:s');
135 return $query->update($data); 135 return $query->update($data);
  136 +
136 } 137 }
137 /** 138 /**
138 * @name : 删除数据 139 * @name : 删除数据
@@ -198,4 +199,5 @@ class Base extends Model @@ -198,4 +199,5 @@ class Base extends Model
198 }); 199 });
199 return $query; 200 return $query;
200 } 201 }
  202 +
201 } 203 }
@@ -106,5 +106,8 @@ return [ @@ -106,5 +106,8 @@ return [
106 */ 106 */
107 107
108 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), 108 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
109 - 109 + //是否写入缓存
  110 + 'user_is_cache' =>[
  111 + 'is_cache' => true,
  112 + ],
110 ]; 113 ];
@@ -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');
@@ -28,8 +26,8 @@ Route::middleware(['bloginauth'])->group(function () { @@ -28,8 +26,8 @@ Route::middleware(['bloginauth'])->group(function () {
28 26
29 //站内信 27 //站内信
30 Route::prefix('mail')->group(function () { 28 Route::prefix('mail')->group(function () {
31 - Route::any('/', [\App\Http\Controllers\Bside\MailController::class, 'lists'])->name('mail_lists');  
32 - Route::any('/info', [\App\Http\Controllers\Bside\MailController::class, 'info'])->name('mail_info'); 29 + Route::any('/', [\App\Http\Controllers\Bside\Mail\MailController::class, 'lists'])->name('mail_lists');
  30 + Route::any('/info', [\App\Http\Controllers\Bside\Mail\MailController::class, 'info'])->name('mail_info');
33 }); 31 });
34 32
35 //用户角色相关路由 33 //用户角色相关路由
@@ -87,6 +85,7 @@ Route::middleware(['bloginauth'])->group(function () { @@ -87,6 +85,7 @@ Route::middleware(['bloginauth'])->group(function () {
87 85
88 //博客 86 //博客
89 Route::any('/', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'lists'])->name('blog_lists'); 87 Route::any('/', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'lists'])->name('blog_lists');
  88 + Route::any('/get_category_list', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'get_category_list'])->name('blog_get_category_list');
90 Route::any('/add', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'add'])->name('blog_add'); 89 Route::any('/add', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'add'])->name('blog_add');
91 Route::any('/info', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'info'])->name('blog_info'); 90 Route::any('/info', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'info'])->name('blog_info');
92 Route::any('/edit', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'edit'])->name('blog_edit'); 91 Route::any('/edit', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'edit'])->name('blog_edit');
@@ -105,11 +104,7 @@ Route::middleware(['bloginauth'])->group(function () { @@ -105,11 +104,7 @@ Route::middleware(['bloginauth'])->group(function () {
105 //ai指令 104 //ai指令
106 Route::prefix('command')->group(function () { 105 Route::prefix('command')->group(function () {
107 //公用ai自动生成 106 //公用ai自动生成
108 - Route::any('/ai_http_post', [\App\Http\Controllers\Bside\AiCommandController::class, 'ai_http_post'])->name('ai_http_post');  
109 - //新闻自动生成  
110 - Route::any('/ai_news', [\App\Http\Controllers\Bside\News\NewsController::class, 'ai_news'])->name('ai_news');  
111 - //博客自动生成  
112 - Route::any('/ai_blog', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'ai_blog'])->name('ai_blog'); 107 + Route::any('/ai_http_post', [\App\Http\Controllers\Bside\Ai\AiCommandController::class, 'ai_http_post'])->name('ai_http_post');
113 }); 108 });
114 109
115 //产品 110 //产品