作者 赵彬吉

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

@@ -7,8 +7,6 @@ use App\Http\Controllers\Aside\BaseController; @@ -7,8 +7,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\Ai\AiCommand as AiCommandModel; 9 use App\Models\Ai\AiCommand as AiCommandModel;
10 -use Illuminate\Http\Request;  
11 -use function App\Helper\send_openai_msg;  
12 10
13 /** 11 /**
14 * @remark :ai指令 12 * @remark :ai指令
@@ -354,8 +354,8 @@ class ProjectController extends BaseController @@ -354,8 +354,8 @@ class ProjectController extends BaseController
354 * @method :post 354 * @method :post
355 * @time :2023/8/30 19:01 355 * @time :2023/8/30 19:01
356 */ 356 */
357 - public function online_check(Request $request, OnlineCheckLogic $logic){  
358 - $request->validate([ 357 + public function online_check(OnlineCheckLogic $logic){
  358 + $this->request->validate([
359 'id'=>'required', 359 'id'=>'required',
360 'type'=>'required|in:optimist,qa', 360 'type'=>'required|in:optimist,qa',
361 'status'=>'required|in:0,1' 361 'status'=>'required|in:0,1'
@@ -423,6 +423,11 @@ class ProjectController extends BaseController @@ -423,6 +423,11 @@ class ProjectController extends BaseController
423 * @time :2023/8/14 10:29 423 * @time :2023/8/14 10:29
424 */ 424 */
425 public function getDomain(){ 425 public function getDomain(){
  426 + $this->request->validate([
  427 + 'project_id'=>'required',
  428 + ],[
  429 + 'project_id.required' => 'project_id不能为空',
  430 + ]);
426 $domainModel = new DomainInfo(); 431 $domainModel = new DomainInfo();
427 $list = $domainModel->list(['status'=>0,'project_id'=>['or',$this->param['project_id']]]); 432 $list = $domainModel->list(['status'=>0,'project_id'=>['or',$this->param['project_id']]]);
428 $this->response('success',Code::SUCCESS,$list); 433 $this->response('success',Code::SUCCESS,$list);