周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 4aa9fe52676f16ec5150c2d323687e179da5f869 1 个父辈 616a1a9d

gx

内嵌 并排对比
正在显示 10 个修改的文件 包含 173 行增加 和 85 行删除
@@ -11,15 +11,19 @@ use Illuminate\Http\Request; @@ -11,15 +11,19 @@ use Illuminate\Http\Request;
11 use function App\Helper\send_openai_msg; 11 use function App\Helper\send_openai_msg;
12 12
13 /** 13 /**
14 - * @name:ai指令 14 + * @remark :ai指令
  15 + * @name :AiCommandController
  16 + * @author :lyh
  17 + * @time :2023/6/17 16:27
15 */ 18 */
16 class AiCommandController extends BaseController 19 class AiCommandController extends BaseController
17 { 20 {
18 /** 21 /**
19 - * @name :指令列表  
20 - * @return void  
21 - * @author :liyuhang  
22 - * @method 22 + * @param AiCommandModel $aiCommandModel
  23 + * @name :lists
  24 + * @author :lyh
  25 + * @method :post
  26 + * @time :2023/6/17 16:27
23 */ 27 */
24 public function lists(AiCommandModel $aiCommandModel){ 28 public function lists(AiCommandModel $aiCommandModel){
25 $lists = $aiCommandModel->lists($this->map,$this->page,$this->row,$this->order); 29 $lists = $aiCommandModel->lists($this->map,$this->page,$this->row,$this->order);
@@ -27,10 +31,11 @@ class AiCommandController extends BaseController @@ -27,10 +31,11 @@ class AiCommandController extends BaseController
27 } 31 }
28 32
29 /** 33 /**
30 - * @name :详情  
31 - * @return void  
32 - * @author :liyuhang  
33 - * @method 34 + * @param AiCommandLogic $aiCommandLogic
  35 + * @name :info
  36 + * @author :lyh
  37 + * @method :post
  38 + * @time :2023/6/17 16:27
34 */ 39 */
35 public function info(AiCommandLogic $aiCommandLogic){ 40 public function info(AiCommandLogic $aiCommandLogic){
36 $this->request->validate([ 41 $this->request->validate([
@@ -41,11 +46,14 @@ class AiCommandController extends BaseController @@ -41,11 +46,14 @@ class AiCommandController extends BaseController
41 $aiCommandLogic->ai_info(); 46 $aiCommandLogic->ai_info();
42 $this->response('success'); 47 $this->response('success');
43 } 48 }
  49 +
44 /** 50 /**
45 - * @name  
46 - * @return void  
47 - * @author :liyuhang  
48 - * @method 51 + * @param AiCommandRequest $request
  52 + * @param AiCommandLogic $aiCommandLogic
  53 + * @name :add
  54 + * @author :lyh
  55 + * @method :post
  56 + * @time :2023/6/17 16:27
49 */ 57 */
50 public function add(AiCommandRequest $request,AiCommandLogic $aiCommandLogic){ 58 public function add(AiCommandRequest $request,AiCommandLogic $aiCommandLogic){
51 $request->validated(); 59 $request->validated();
@@ -54,10 +62,12 @@ class AiCommandController extends BaseController @@ -54,10 +62,12 @@ class AiCommandController extends BaseController
54 } 62 }
55 63
56 /** 64 /**
57 - * @name  
58 - * @return void  
59 - * @author :liyuhang  
60 - * @method 65 + * @param AiCommandRequest $request
  66 + * @param AiCommandLogic $aiCommandLogic
  67 + * @name :edit
  68 + * @author :lyh
  69 + * @method :post
  70 + * @time :2023/6/17 16:28
61 */ 71 */
62 public function edit(AiCommandRequest $request,AiCommandLogic $aiCommandLogic){ 72 public function edit(AiCommandRequest $request,AiCommandLogic $aiCommandLogic){
63 $request->validate([ 73 $request->validate([
@@ -70,10 +80,11 @@ class AiCommandController extends BaseController @@ -70,10 +80,11 @@ class AiCommandController extends BaseController
70 } 80 }
71 81
72 /** 82 /**
73 - * @name  
74 - * @return void  
75 - * @author :liyuhang  
76 - * @method 83 + * @param AiCommandLogic $aiCommandLogic
  84 + * @name :del
  85 + * @author :lyh
  86 + * @method :post
  87 + * @time :2023/6/17 16:27
77 */ 88 */
78 public function del(AiCommandLogic $aiCommandLogic){ 89 public function del(AiCommandLogic $aiCommandLogic){
79 $this->request->validate([ 90 $this->request->validate([
@@ -6,14 +6,20 @@ use App\Enums\Common\Code; @@ -6,14 +6,20 @@ use App\Enums\Common\Code;
6 use App\Http\Controllers\Aside\BaseController; 6 use App\Http\Controllers\Aside\BaseController;
7 use App\Models\Ai\AiLog as AiLogModel; 7 use App\Models\Ai\AiLog as AiLogModel;
8 8
9 - 9 +/**
  10 + * @remark :ai发送记录
  11 + * @name :AiLogController
  12 + * @author :lyh
  13 + * @time :2023/6/17 16:26
  14 + */
10 class AiLogController extends BaseController 15 class AiLogController extends BaseController
11 { 16 {
12 /** 17 /**
13 - * @name :ai日志列表  
14 - * @return void  
15 - * @author :liyuhang  
16 - * @method 18 + * @param AiLogModel $aiLogModel
  19 + * @name :(ai发送日志列表)lists
  20 + * @author :lyh
  21 + * @method :post
  22 + * @time :2023/6/17 16:25
17 */ 23 */
18 public function lists(AiLogModel $aiLogModel){ 24 public function lists(AiLogModel $aiLogModel){
19 $lists = $aiLogModel->lists($this->map,$this->page,$this->row,$this->order); 25 $lists = $aiLogModel->lists($this->map,$this->page,$this->row,$this->order);
@@ -64,10 +64,13 @@ class BaseController extends Controller @@ -64,10 +64,13 @@ class BaseController extends Controller
64 $this->header['token'] = $this->token; 64 $this->header['token'] = $this->token;
65 return response()->json($response,200,$this->header); 65 return response()->json($response,200,$this->header);
66 } 66 }
  67 +
67 /** 68 /**
68 - * @name :参数过滤  
69 - * @author :liyuhang  
70 - * @method 69 + * @remark :请求参数处理
  70 + * @name :get_param
  71 + * @author :lyh
  72 + * @method :post
  73 + * @time :2023/6/17 16:34
71 */ 74 */
72 public function get_param(){ 75 public function get_param(){
73 $param = $this->param; 76 $param = $this->param;
@@ -105,11 +108,18 @@ class BaseController extends Controller @@ -105,11 +108,18 @@ class BaseController extends Controller
105 } 108 }
106 } 109 }
107 } 110 }
  111 +
108 /** 112 /**
109 - * @name 统一返回参数  
110 - * @return JsonResponse  
111 - * @author :liyuhang  
112 - * @method 113 + * @param $msg
  114 + * @param string $code
  115 + * @param $data
  116 + * @param $result_code
  117 + * @param $type
  118 + * @remark :统一返回
  119 + * @name :response
  120 + * @author :lyh
  121 + * @method :post
  122 + * @time :2023/6/17 16:34
113 */ 123 */
114 public function response($msg = null,string $code = Code::SUCCESS,$data = [],$result_code = 200,$type = 'application/json'): JsonResponse 124 public function response($msg = null,string $code = Code::SUCCESS,$data = [],$result_code = 200,$type = 'application/json'): JsonResponse
115 { 125 {
@@ -128,10 +138,11 @@ class BaseController extends Controller @@ -128,10 +138,11 @@ class BaseController extends Controller
128 138
129 /** 139 /**
130 * @param $data 140 * @param $data
131 - * @name :返回参数统一处理  
132 - * @return array|string  
133 - * @author :liyuhang  
134 - * @method 141 + * @remark :统一返回参数处理
  142 + * @name :_extents
  143 + * @author :lyh
  144 + * @method :post
  145 + * @time :2023/6/17 16:34
135 */ 146 */
136 protected function _extents($data) { 147 protected function _extents($data) {
137 148
@@ -158,7 +169,5 @@ class BaseController extends Controller @@ -158,7 +169,5 @@ class BaseController extends Controller
158 169
159 170
160 171
161 -  
162 -  
163 - 172 +
164 } 173 }
@@ -20,10 +20,11 @@ class MailController extends BaseController @@ -20,10 +20,11 @@ class MailController extends BaseController
20 } 20 }
21 21
22 /** 22 /**
23 - * @name :详情  
24 - * @return void  
25 - * @author :liyuhang  
26 - * @method 23 + * @param MailLogic $mailLogic
  24 + * @name :info
  25 + * @author :lyh
  26 + * @method :post
  27 + * @time :2023/6/17 16:25
27 */ 28 */
28 public function info(MailLogic $mailLogic){ 29 public function info(MailLogic $mailLogic){
29 $this->request->validate([ 30 $this->request->validate([
@@ -37,10 +38,12 @@ class MailController extends BaseController @@ -37,10 +38,12 @@ class MailController extends BaseController
37 38
38 39
39 /** 40 /**
40 - * @name :添加站内信  
41 - * @return void  
42 - * @author :liyuhang  
43 - * @method 41 + * @param MailRequest $mailRequest
  42 + * @param MailLogic $mailLogic
  43 + * @name :add
  44 + * @author :lyh
  45 + * @method :post
  46 + * @time :2023/6/17 16:25
44 */ 47 */
45 public function add(MailRequest $mailRequest,MailLogic $mailLogic){ 48 public function add(MailRequest $mailRequest,MailLogic $mailLogic){
46 $mailRequest->validated(); 49 $mailRequest->validated();
@@ -49,10 +52,12 @@ class MailController extends BaseController @@ -49,10 +52,12 @@ class MailController extends BaseController
49 } 52 }
50 53
51 /** 54 /**
52 - * @name :编辑站内信  
53 - * @return void  
54 - * @author :liyuhang  
55 - * @method 55 + * @param MailRequest $mailRequest
  56 + * @param MailLogic $mailLogic
  57 + * @name :edit
  58 + * @author :lyh
  59 + * @method :post
  60 + * @time :2023/6/17 16:24
56 */ 61 */
57 public function edit(MailRequest $mailRequest,MailLogic $mailLogic){ 62 public function edit(MailRequest $mailRequest,MailLogic $mailLogic){
58 $mailRequest->validate([ 63 $mailRequest->validate([
@@ -65,10 +70,11 @@ class MailController extends BaseController @@ -65,10 +70,11 @@ class MailController extends BaseController
65 } 70 }
66 71
67 /** 72 /**
68 - * @name :逻辑删除站内信  
69 - * @return void  
70 - * @author :liyuhang  
71 - * @method 73 + * @param MailLogic $mailLogic
  74 + * @name :del
  75 + * @author :lyh
  76 + * @method :post
  77 + * @time :2023/6/17 16:24
72 */ 78 */
73 public function del(MailLogic $mailLogic){ 79 public function del(MailLogic $mailLogic){
74 $this->request->validate([ 80 $this->request->validate([
@@ -4,6 +4,12 @@ namespace App\Http\Controllers\Aside\User; @@ -4,6 +4,12 @@ namespace App\Http\Controllers\Aside\User;
4 4
5 use App\Http\Controllers\Aside\BaseController; 5 use App\Http\Controllers\Aside\BaseController;
6 6
  7 +/**
  8 + * @remark :b端用户组织架构
  9 + * @name :ProjectDeptController
  10 + * @author :lyh
  11 + * @time :2023/6/17 16:23
  12 + */
7 class ProjectDeptController extends BaseController 13 class ProjectDeptController extends BaseController
8 { 14 {
9 /** 15 /**
@@ -10,6 +10,12 @@ use App\Models\User\ProjectMenu; @@ -10,6 +10,12 @@ use App\Models\User\ProjectMenu;
10 use App\Models\User\ProjectMenu as ProjectMenuModel; 10 use App\Models\User\ProjectMenu as ProjectMenuModel;
11 use Illuminate\Http\Request; 11 use Illuminate\Http\Request;
12 12
  13 +/**
  14 + * @remark :b端菜单管理
  15 + * @name :ProjectMenuController
  16 + * @author :lyh
  17 + * @time :2023/6/17 16:23
  18 + */
13 class ProjectMenuController extends BaseController 19 class ProjectMenuController extends BaseController
14 { 20 {
15 /** 21 /**
@@ -9,6 +9,12 @@ use App\Http\Requests\Aside\User\ProjectRoleRequest; @@ -9,6 +9,12 @@ use App\Http\Requests\Aside\User\ProjectRoleRequest;
9 use App\Models\User\ProjectRole as ProjectRoleModel; 9 use App\Models\User\ProjectRole as ProjectRoleModel;
10 use Illuminate\Http\Request; 10 use Illuminate\Http\Request;
11 11
  12 +/**
  13 + * @remark :b端用户角色设置管理
  14 + * @name :ProjectRoleController
  15 + * @author :lyh
  16 + * @time :2023/6/17 16:22
  17 + */
12 class ProjectRoleController extends BaseController 18 class ProjectRoleController extends BaseController
13 { 19 {
14 /** 20 /**
@@ -9,6 +9,12 @@ use App\Http\Requests\Aside\User\UserRequest; @@ -9,6 +9,12 @@ use App\Http\Requests\Aside\User\UserRequest;
9 use App\Models\User\User as UserModel; 9 use App\Models\User\User as UserModel;
10 use Illuminate\Http\Request; 10 use Illuminate\Http\Request;
11 11
  12 +/**
  13 + * @remark :b端用户管理
  14 + * @name :ProjectUserController
  15 + * @author :lyh
  16 + * @time :2023/6/17 16:24
  17 + */
12 class ProjectUserController extends BaseController 18 class ProjectUserController extends BaseController
13 { 19 {
14 /** 20 /**
@@ -108,8 +108,13 @@ class FileController @@ -108,8 +108,13 @@ class FileController
108 echo $content; 108 echo $content;
109 exit; 109 exit;
110 } 110 }
  111 +
111 /** 112 /**
112 - * 图片上传 113 + * @remark :上传文件
  114 + * @name :upload
  115 + * @author :lyh
  116 + * @method :post
  117 + * @time :2023/6/17 16:32
113 */ 118 */
114 public function upload() { 119 public function upload() {
115 $this->request->validate([ 120 $this->request->validate([
@@ -129,11 +134,14 @@ class FileController @@ -129,11 +134,14 @@ class FileController
129 return $this->single($files); 134 return $this->single($files);
130 } 135 }
131 } 136 }
  137 +
132 /** 138 /**
133 - * @name :上传  
134 - * @return void  
135 - * @author :liyuhang  
136 - * @method 139 + * @param $files
  140 + * @remark :单文件上传
  141 + * @name :single
  142 + * @author :lyh
  143 + * @method :post
  144 + * @time :2023/6/17 16:32
137 */ 145 */
138 public function single($files){ 146 public function single($files){
139 $hash = hash_file('md5', $files->getPathname()); 147 $hash = hash_file('md5', $files->getPathname());
@@ -162,10 +170,14 @@ class FileController @@ -162,10 +170,14 @@ class FileController
162 } 170 }
163 return $this->response('资源',Code::SUCCESS,['file'=>$hash]); 171 return $this->response('资源',Code::SUCCESS,['file'=>$hash]);
164 } 172 }
  173 +
165 /** 174 /**
166 - * 多文件上传  
167 - * @param type $files file对象集合  
168 - * @return type 175 + * @param $files
  176 + * @remark :多文件上传
  177 + * @name :multi
  178 + * @author :lyh
  179 + * @method :post
  180 + * @time :2023/6/17 16:32
169 */ 181 */
170 private function multi($files) { 182 private function multi($files) {
171 if (!is_array($files)) { 183 if (!is_array($files)) {
@@ -199,11 +211,18 @@ class FileController @@ -199,11 +211,18 @@ class FileController
199 $fileModel->insert($save_data); 211 $fileModel->insert($save_data);
200 return $this->response('资源',Code::SUCCESS,['file'=>$data]); 212 return $this->response('资源',Code::SUCCESS,['file'=>$data]);
201 } 213 }
  214 +
202 /** 215 /**
203 - * @name 统一返回参数  
204 - * @return JsonResponse  
205 - * @author :liyuhang  
206 - * @method 216 + * @param $msg
  217 + * @param string $code
  218 + * @param $data
  219 + * @param $result_code
  220 + * @param $type
  221 + * @remark :统一返回接口
  222 + * @name :response
  223 + * @author :lyh
  224 + * @method :post
  225 + * @time :2023/6/17 16:33
207 */ 226 */
208 public function response($msg = null,string $code = Code::SUCCESS,$data = [],$result_code = 200,$type = 'application/json'): JsonResponse 227 public function response($msg = null,string $code = Code::SUCCESS,$data = [],$result_code = 200,$type = 'application/json'): JsonResponse
209 { 228 {
@@ -220,10 +239,11 @@ class FileController @@ -220,10 +239,11 @@ class FileController
220 239
221 /** 240 /**
222 * @param $data 241 * @param $data
223 - * @name :返回参数处理  
224 - * @return array|string  
225 - * @author :liyuhang  
226 - * @method 242 + * @remark :参数处理
  243 + * @name :_extents
  244 + * @author :lyh
  245 + * @method :post
  246 + * @time :2023/6/17 16:32
227 */ 247 */
228 protected function _extents($data) { 248 protected function _extents($data) {
229 249
@@ -91,7 +91,10 @@ class ImageController @@ -91,7 +91,10 @@ class ImageController
91 } 91 }
92 92
93 /** 93 /**
94 - * 图片上传 94 + * @name :(图片上传)upload
  95 + * @author :lyh
  96 + * @method :post
  97 + * @time :2023/6/17 16:28
95 */ 98 */
96 public function upload() { 99 public function upload() {
97 $this->request->validate([ 100 $this->request->validate([
@@ -112,10 +115,12 @@ class ImageController @@ -112,10 +115,12 @@ class ImageController
112 } 115 }
113 116
114 /** 117 /**
115 - * @name :上传图片  
116 - * @return void  
117 - * @author :liyuhang  
118 - * @method 118 + * @param $files
  119 + * @remark :单图片上传
  120 + * @name :single
  121 + * @author :lyh
  122 + * @method :post
  123 + * @time :2023/6/17 16:30
119 */ 124 */
120 public function single($files){ 125 public function single($files){
121 $hash = hash_file('md5', $files->getPathname()); 126 $hash = hash_file('md5', $files->getPathname());
@@ -144,12 +149,16 @@ class ImageController @@ -144,12 +149,16 @@ class ImageController
144 } 149 }
145 return $this->response('图片资源',Code::SUCCESS,['image'=>$hash]); 150 return $this->response('图片资源',Code::SUCCESS,['image'=>$hash]);
146 } 151 }
  152 +
147 /** 153 /**
148 - * 生成缩略图缓存  
149 - * @param type $info  
150 - * @param type $w  
151 - * @param type $h  
152 - * @return string 154 + * @param $info
  155 + * @param $w
  156 + * @param $h
  157 + * @remark :生成缩略图
  158 + * @name :cacheImage
  159 + * @author :lyh
  160 + * @method :post
  161 + * @time :2023/6/17 16:31
153 */ 162 */
154 private function cacheImage($info, $w, $h) { 163 private function cacheImage($info, $w, $h) {
155 $path = $info['path']; 164 $path = $info['path'];
@@ -159,9 +168,12 @@ class ImageController @@ -159,9 +168,12 @@ class ImageController
159 } 168 }
160 169
161 /** 170 /**
162 - * 多图片上传  
163 - * @param type $files file对象集合  
164 - * @return type 171 + * @param $files
  172 + * @remark :多图片上传
  173 + * @name :multi
  174 + * @author :lyh
  175 + * @method :post
  176 + * @time :2023/6/17 16:31
165 */ 177 */
166 private function multi($files) { 178 private function multi($files) {
167 179