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

@@ -10,11 +10,14 @@
 namespace App\Console\Commands;
 namespace App\Console\Commands;
 
 
 use App\Helper\Arr;
 use App\Helper\Arr;
+use App\Models\CustomModule\CustomModuleCategory;
+use App\Models\CustomModule\CustomModuleContent;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -51,20 +54,37 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>51]);
+        $list = $projectModel->list(['id'=>99]);
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
 //            $this->getProduct();
 //            $this->getProduct();
-            $this->setProductKeyword();
+//            $this->setProductKeyword();
 //            $this->getRouteMap();
 //            $this->getRouteMap();
 //            $this->getProductCategory();
 //            $this->getProductCategory();
 //            $this->delRouteMap();
 //            $this->delRouteMap();
+            $this->setCustomRoute($v['id']);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
 
 
+    public function setCustomRoute($project_id){
+//        $customModel = new CustomModuleContent();
+//        $list = $customModel->list();
+//        foreach ($list as $v){
+//                $route = RouteMap::setRoute($v['name'], RouteMap::SOURCE_MODULE, $v['id'], $project_id);
+//                $customModel->edit(['route'=>$route],['id'=>$v['id']]);
+//        }
+        $cateModel = new CustomModuleCategory();
+        $lists = $cateModel->list();
+        foreach ($lists as $v1){
+                $route = RouteMap::setRoute($v1['name'], RouteMap::SOURCE_MODULE_CATE, $v1['id'], $project_id);
+                $cateModel->edit(['route'=>$route],['id'=>$v1['id']]);
+
+        }
+    }
+
     /**
     /**
      * @remark :写入
      * @remark :写入
      * @name   :getProductKeyword
      * @name   :getProductKeyword

@@ -34,8 +34,10 @@ class PrivateController extends BaseController
         $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
         $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
-            ->where('c.qa_status', '=', OnlineCheck::STATUS_ONLINE_TRUE)
             ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
             ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
+            ->where(function ($subQuery) {
+                $subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
+            })
             ->paginate($page_size)
             ->paginate($page_size)
             ->toArray();
             ->toArray();
         return $this->success($result);
         return $this->success($result);

@@ -275,4 +275,16 @@ class BlogController extends BaseController
         $logic->setSort();
         $logic->setSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :批量排序
+     * @name   :allSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/11 9:46
+     */
+    public function allSort(BlogLogic $logic){
+        $logic->setAllSort();
+        $this->response('success');
+    }
 }
 }

@@ -262,4 +262,16 @@ class NewsController extends BaseController
         $newsLogic->setSort();
         $newsLogic->setSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :批量排序
+     * @name   :allSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/11 9:47
+     */
+    public function allSort(NewsLogic $newsLogic){
+        $newsLogic->setAllSort();
+        $this->response('success');
+    }
 }
 }

@@ -234,6 +234,20 @@ class BlogLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :
+     * @name   :setAllSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 15:40
+     */
+    public function setAllSort(){
+        foreach ($this->param['data'] as $k => $v){
+            $this->model->edit(['sort'=>$v['sort']],['id'=>$v['id']]);
+        }
+        return $this->success();
+    }
+
+    /**
      * 博客导入
      * 博客导入
      * @param $project_id
      * @param $project_id
      * @param $user_id
      * @param $user_id

@@ -250,6 +250,21 @@ class NewsLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :
+     * @name   :setAllSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/10 15:40
+     */
+    public function setAllSort(){
+        foreach ($this->param['data'] as $k => $v){
+            $this->model->edit(['sort'=>$v['sort']],['id'=>$v['id']]);
+        }
+        return $this->success();
+    }
+
+
+    /**
      * @remark :删除路由
      * @remark :删除路由
      * @name   :delRoute
      * @name   :delRoute
      * @author :lyh
      * @author :lyh

@@ -30,6 +30,10 @@ class Project extends Base
 
 
     const TYPE_SEVEN = 7;//错误单
     const TYPE_SEVEN = 7;//错误单
     const MYSQL_ID = 2;//默认数据库id
     const MYSQL_ID = 2;//默认数据库id
+
+    const IS_UPGRADE_FALSE = 0;
+    const IS_UPGRADE_TRUE = 1;
+
     /**
     /**
      * 星级客户
      * 星级客户
      * @return string[]
      * @return string[]

@@ -74,6 +74,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('news_del');
         Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('news_del');
         Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_status');
         Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_status');
         Route::any('/sort', [\App\Http\Controllers\Bside\News\NewsController::class, 'sort'])->name('news_sort');
         Route::any('/sort', [\App\Http\Controllers\Bside\News\NewsController::class, 'sort'])->name('news_sort');
+        Route::any('/allSort', [\App\Http\Controllers\Bside\News\NewsController::class, 'allSort'])->name('news_allSort');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum');
     });
     });
 
 
@@ -89,6 +90,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/del', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'del'])->name('blog_del');
         Route::any('/del', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'del'])->name('blog_del');
         Route::any('/status', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'status'])->name('blog_status');
         Route::any('/status', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'status'])->name('blog_status');
         Route::any('/sort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'sort'])->name('blog_sort');
         Route::any('/sort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'sort'])->name('blog_sort');
+        Route::any('/allSort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'allSort'])->name('blog_allSort');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum');
         //分类
         //分类
         Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');
         Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');