合并分支 'master-server' 到 'master'

合并代码



查看合并请求 !735

@@ -30,7 +30,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
         $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
 //        $schedule->command('domain_info')->dailyAt('01:20')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
 //        $schedule->command('domain_info')->dailyAt('01:20')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
-                $schedule->command('share_user')->dailyAt('01:20')->withoutOverlapping(1);// 每天凌晨1点执行一次
+        $schedule->command('share_user')->dailyAt('01:20')->withoutOverlapping(1);// 每天凌晨1点执行一次
         $schedule->command('last_inquiry')->dailyAt('04:00')->withoutOverlapping(1);// 最近一次询盘信息
         $schedule->command('last_inquiry')->dailyAt('04:00')->withoutOverlapping(1);// 最近一次询盘信息
         $schedule->command('update_seo_tdk_crontab')->dailyAt('20:00')->withoutOverlapping(1); //更新上线项目TDK
         $schedule->command('update_seo_tdk_crontab')->dailyAt('20:00')->withoutOverlapping(1); //更新上线项目TDK
         $schedule->command('sync_manager')->dailyAt('01:00')->withoutOverlapping(1); //TODO::手机号码同步  每天执行一次
         $schedule->command('sync_manager')->dailyAt('01:00')->withoutOverlapping(1); //TODO::手机号码同步  每天执行一次

@@ -278,7 +278,7 @@ class OptimizeController extends BaseController
         if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
         if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
         }
         }
-        $query = $query->where('gl_project.type',2);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
+        $query = $query->where('gl_project.type',2)->where('gl_project.type','!=',5);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
         $query->where(function ($subQuery) {
         $query->where(function ($subQuery) {
             $subQuery->orwhere('gl_project_online_check.qa_status',1)->orwhere('gl_project.is_upgrade',1);
             $subQuery->orwhere('gl_project_online_check.qa_status',1)->orwhere('gl_project.is_upgrade',1);
         });
         });

@@ -734,11 +734,12 @@ class ProductController extends BaseController
      * @time   :2024/8/30 16:29
      * @time   :2024/8/30 16:29
      */
      */
     public function getButton(){
     public function getButton(){
-        return [
+        $data = [
             '0'=>'草稿',
             '0'=>'草稿',
             '1'=>'发布',
             '1'=>'发布',
             '2'=>'回收站',
             '2'=>'回收站',
             '3'=>'待发布'
             '3'=>'待发布'
         ];
         ];
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -182,6 +182,11 @@ class BlogLogic extends BaseLogic
         }else{
         }else{
             $param['category_id'] = '';
             $param['category_id'] = '';
         }
         }
+        if(isset($this->param['release_at']) && !empty(($this->param['release_at'])) && ($this->param['status'] == 3)){
+            if($this->param['release_at'] < date('Y-m-d 23:59:59')){
+                $this->fail('发布时间需大于当天');
+            }
+        }
         return $this->success($param);
         return $this->success($param);
     }
     }
 
 

@@ -201,6 +201,11 @@ class NewsLogic extends BaseLogic
         }else{
         }else{
             $param['category_id'] = '';
             $param['category_id'] = '';
         }
         }
+        if(isset($this->param['release_at']) && !empty(($this->param['release_at'])) && ($this->param['status'] == 3)){
+            if($this->param['release_at'] < date('Y-m-d 23:59:59')){
+                $this->fail('发布时间需大于当天');
+            }
+        }
         return $this->success($param);
         return $this->success($param);
     }
     }
 
 

@@ -315,6 +315,11 @@ class ProductLogic extends  BaseLogic
         }else{
         }else{
             $param['icon'] = Arr::a2s([]);
             $param['icon'] = Arr::a2s([]);
         }
         }
+        if(isset($this->param['send_time']) && !empty(($this->param['send_time'])) && ($this->param['status'] == 3)){
+            if($this->param['send_time'] < date('Y-m-d 23:59:59')){
+                $this->fail('发布时间需大于当天');
+            }
+        }
         $param['created_uid'] = $this->user['id'];
         $param['created_uid'] = $this->user['id'];
         return $param;
         return $param;
     }
     }