Merge remote-tracking branch 'origin/master' into akun

刘锟
app/Console/Commands/Product/SendProduct.php
app/Console/Kernel.php
app/Http/Controllers/Aside/Optimize/OptimizeController.php
app/Http/Controllers/Bside/Product/ProductController.php
app/Http/Logic/Bside/Blog/BlogLogic.php
app/Http/Logic/Bside/News/NewsLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
routes/bside.php
--- a/app/Console/Commands/Product/SendProduct.php 0 → 100644
查看文件 @dd09ed4
+++ b/app/Console/Commands/Product/SendProduct.php 0 → 100644
查看文件 @dd09ed4
+<?php
+/**
+ * @remark :
+ * @name   :SendProduct.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/8/30 14:41
+ */
+
+namespace App\Console\Commands\Product;
+
+use App\Models\Blog\Blog;
+use App\Models\Domain\DomainInfo;
+use App\Models\News\News;
+use App\Models\Product\Product;
+use App\Models\Project\Project;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class SendProduct extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'send_product';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '根据发布时间发布产品';
+
+    /**
+     * @remark :发布
+     * @name   :handle
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/30 14:42
+     */
+    public function handle(){
+        $projectModel = new Project();
+        $list = $projectModel->list(['deleted_status'=>0]);
+        $data = [];
+        foreach ($list as $v){
+            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+            ProjectServer::useProject($v['id']);
+            $domainModel = new DomainInfo();
+            $domain = $domainModel->getProjectIdDomain($v['id']);
+            if(empty($domain)){
+                continue;
+            }
+            $arr1 = $this->sendProduct();
+            $arr2 = $this->sendBlog();
+            $arr3 = $this->sendNews();
+            $c_url = $domain.'api/update_page/';
+            $param = [
+                'project_id' => $this->user['project_id'],
+                'type' => 1,
+                'route' => 3,
+                'url' => array_merge($arr1,$arr2,$arr3),
+                'language'=> [],
+                'is_sitemap' => 0
+            ];
+            http_post($c_url, json_encode($param));
+            //TODO::通知C端生成界面
+            DB::disconnect('custom_mysql');
+        }
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+    }
+
+    /**
+     * @remark :发布产品
+     * @name   :sendProduct
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/30 14:44
+     */
+    public function sendProduct(){
+        $start_date = date('Y-m-d H:i:s');
+        $end_date = date('Y-m-d 23:59:59');
+        $productModel = new Product();
+        $arr = $productModel->formatQuery(['send_time'=>['between',[$start_date,$end_date]],'status'=>3])->pluck('route');
+        $productModel->edit(['status'=>1],['send_time'=>['between',[$start_date,$end_date]],'status'=>3]);
+        return $arr;
+    }
+
+    /**
+     * @remark :定时发布博客
+     * @name   :sendBlog
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/30 15:19
+     */
+    public function sendBlog(){
+        $start_date = date('Y-m-d H:i:s');
+        $end_date = date('Y-m-d 23:59:59');
+        $blogModel = new Blog();
+        $arr = $blogModel->formatQuery(['send_time'=>['between',[$start_date,$end_date]],'status'=>3])->pluck('url');
+        $blogModel->edit(['status'=>1],['release_at'=>['between',[$start_date,$end_date]],'status'=>3]);
+        return $arr;
+    }
+
+    /**
+     * @remark :定时发布新闻
+     * @name   :sendNews
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/30 15:19
+     */
+    public function sendNews(){
+        $start_date = date('Y-m-d H:i:s');
+        $end_date = date('Y-m-d 23:59:59');
+        $newsModel = new News();
+        $arr = $newsModel->formatQuery(['send_time'=>['between',[$start_date,$end_date]],'status'=>3])->pluck('url');
+        $newsModel->edit(['status'=>1],['release_at'=>['between',[$start_date,$end_date]],'status'=>3]);
+        return $arr;
+    }
+}
--- a/app/Console/Kernel.php
查看文件 @dd09ed4
+++ b/app/Console/Kernel.php
查看文件 @dd09ed4
@@ -30,7 +30,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(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('update_seo_tdk_crontab')->dailyAt('20:00')->withoutOverlapping(1); //更新上线项目TDK
         $schedule->command('sync_manager')->dailyAt('01:00')->withoutOverlapping(1); //TODO::手机号码同步  每天执行一次
--- a/app/Http/Controllers/Aside/Optimize/OptimizeController.php
查看文件 @dd09ed4
+++ b/app/Http/Controllers/Aside/Optimize/OptimizeController.php
查看文件 @dd09ed4
@@ -278,7 +278,7 @@ class OptimizeController extends BaseController
         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.type',2);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
+        $query = $query->where('gl_project.type',2)->where('gl_project.extend_type','!=',5);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
         $query->where(function ($subQuery) {
             $subQuery->orwhere('gl_project_online_check.qa_status',1)->orwhere('gl_project.is_upgrade',1);
         });
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @dd09ed4
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @dd09ed4
@@ -164,7 +164,11 @@ class ProductController extends BaseController
             $query = $query->where('title','like','%'.$this->map['title'].'%');
         }
         if(isset($this->map['status'])){
-            $query = $query->where('status',$this->map['status']);
+            if($this->map['status'] == 0){
+                $query = $query->whereIn('status',[0,3]);
+            }else{
+                $query = $query->where('status',$this->map['status']);
+            }
         }
         if(isset($this->map['created_uid'])){
             $query = $query->where('created_uid',$this->map['created_uid']);
@@ -721,4 +725,21 @@ class ProductController extends BaseController
         $typeModel->del(['project_id'=>$this->user['project_id'],'name'=>$this->param['name']]);
         $this->response('success');
     }
+
+    /**
+     * @remark :获取按钮
+     * @name   :getButton
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/30 16:29
+     */
+    public function getButton(){
+        $data = [
+            '0'=>'草稿',
+            '1'=>'发布',
+            '2'=>'回收站',
+            '3'=>'待发布'
+        ];
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
--- a/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @dd09ed4
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @dd09ed4
@@ -182,6 +182,11 @@ class BlogLogic extends BaseLogic
         }else{
             $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);
     }
--- a/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @dd09ed4
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @dd09ed4
@@ -201,6 +201,11 @@ class NewsLogic extends BaseLogic
         }else{
             $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);
     }
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @dd09ed4
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @dd09ed4
@@ -315,6 +315,11 @@ class ProductLogic extends  BaseLogic
         }else{
             $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'];
         return $param;
     }
--- a/routes/bside.php
查看文件 @dd09ed4
+++ b/routes/bside.php
查看文件 @dd09ed4
@@ -260,6 +260,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/getProductType', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getProductType'])->name('product_getProductType');
         Route::any('/saveType', [\App\Http\Controllers\Bside\Product\ProductController::class, 'saveType'])->name('product_saveType');
         Route::any('/delProductType', [\App\Http\Controllers\Bside\Product\ProductController::class, 'delProductType'])->name('product_delProductType');
+        Route::any('/getButton', [\App\Http\Controllers\Bside\Product\ProductController::class, 'getButton'])->name('product_getButton');
         //产品分类
         Route::get('category', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'index'])->name('product_category');
         Route::get('category/info', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'info'])->name('product_category_info');