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

刘锟
app/Console/Commands/UpdateMainHtml.php
app/Console/Commands/UpdateRoute.php
app/Http/Controllers/Aside/Optimize/OptimizeController.php
app/Http/Logic/Bside/Product/ProductLogic.php
routes/aside.php
routes/bside.php
--- a/app/Console/Commands/UpdateMainHtml.php
查看文件 @5643268
+++ b/app/Console/Commands/UpdateMainHtml.php
查看文件 @5643268
@@ -11,6 +11,7 @@ namespace App\Console\Commands;
 use App\Models\Blog\Blog;
 use App\Models\Blog\BlogCategory;
+use App\Models\CustomModule\CustomModule;
 use App\Models\News\News;
 use App\Models\News\NewsCategory;
 use App\Models\Product\Category;
@@ -45,7 +46,7 @@ class UpdateMainHtml extends Command
      *
      * @var string
      */
-    protected $description = '洗数据';
+    protected $description = '生成视频模块';
     /**
      * @remark :统一更新路由
@@ -60,45 +61,27 @@ class UpdateMainHtml extends Command
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
-            $this->editMainHtml($v['id']);
+            $this->initModule($v['id']);
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
-    /**
-     * @remark :洗数据
-     * @name   :getMainHtml
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/27 18:03
-     */
-    public function editMainHtml($project_id){
-        $templateModel = new BTemplate();
-        $info = $templateModel->read(['source'=>4,'source_id'=>0]);
-        if($info !== false){
-            $mainModel = new BTemplateMain();
-            $mainInfo = $mainModel->read(['type'=>4,'is_list'=>1]);
-            if($mainInfo === false){
+    public function initModule($project_id){
+        $moduleModel = new CustomModule();
+        $info = $moduleModel->read(['route'=>'video']);
+        if($info === false){
+            $info = $moduleModel->read(['name'=>'视频模块']);
+            if($info === false){
                 $data = [
-                    'type'=>4,
-                    'is_list'=>1,
-                    'main_html'=>$info['main_html'],
-                    'main_css'=>$info['main_css'],
-                    'section_list_id'=>$info['section_list_id'],
-                    'project_id'=>$project_id
-                ];
-                $mainModel->add($data);
-            }else{
-                $data = [
-                    'main_html'=>$info['main_html'],
-                    'main_css'=>$info['main_css'],
-                    'section_list_id'=>$info['section_list_id'],
+                    'name'=>'视频模块',
                     'project_id'=>$project_id,
+                    'route'=>'video',
                 ];
-                $mainModel->edit($data,['id'=>$mainInfo['id']]);
+                $moduleModel->add($data);
             }
         }
         return true;
     }
+
 }
--- a/app/Console/Commands/UpdateRoute.php
查看文件 @5643268
+++ b/app/Console/Commands/UpdateRoute.php
查看文件 @5643268
@@ -54,12 +54,12 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[183]],'is_upgrade'=>0]);
+        $list = $projectModel->list(['id'=>['in',[221]],'is_upgrade'=>0]);
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
-//            $this->getProduct();
-            $this->setProductKeyword();
+            $this->getProduct();
+//            $this->setProductKeyword();
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
--- a/app/Http/Controllers/Aside/Optimize/OptimizeController.php
查看文件 @5643268
+++ b/app/Http/Controllers/Aside/Optimize/OptimizeController.php
查看文件 @5643268
@@ -108,6 +108,8 @@ class OptimizeController extends BaseController
             'gl_project.is_remain_today AS is_remain_today',
             'gl_project.remain_day AS remain_day',
             'gl_project.robots AS robots',
+            'gl_project.is_translate AS is_translate',
+            'gl_project.is_translate_tag AS is_translate_tag',
             'gl_project_online_check.id AS online_check_id',
             'gl_project_online_check.question AS question',
             'gl_project_online_check.go_question AS go_question',
@@ -275,4 +277,26 @@ class OptimizeController extends BaseController
         }
         $this->response('success',Code::SUCCESS,['url'=>$domain.'robots.txt']);
     }
+
+    /**
+     * @remark :更改状态
+     * @name   :editTranslateStatus
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/29 15:28
+     */
+    public function editTranslateStatus(){
+        $this->request->validate([
+            'project_id'=>'required',
+            'status'=>'required',
+            'type'=>'required',
+        ],[
+            'project_id.required' => 'project_id不能为空',
+            'status.required' => 'status不能为空',
+            'type.required' => 'type不能为空',
+        ]);
+        $projectModel = new Project();
+        $projectModel->edit([$this->param['type']=>$this->param['status']],['id'=>$this->param['project_id']]);
+        $this->response('success');
+    }
 }
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @5643268
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @5643268
@@ -230,6 +230,9 @@ class ProductLogic extends  BaseLogic
             $arr = [];
             $keywordModel = new Keyword();
             foreach ($keyword as $v){
+                if(empty($v)){
+                    continue;
+                }
                 //查询当前关键字是否存在
                 $info = $keywordModel->read(['title'=>$v],['id']);
                 if($info === false){
@@ -269,6 +272,7 @@ class ProductLogic extends  BaseLogic
             $param['thumb'] = Arr::a2s($param['gallery'][0] ?? []);
             $param['gallery'] = Arr::a2s($param['gallery'] ?? []);
         }else{
+            $param['gallery'] = Arr::a2s([]);
             $param['thumb'] =  Arr::a2s([]);
         }
         $param['attrs'] = Arr::a2s($param['attrs'] ?? []);
--- a/routes/aside.php
查看文件 @5643268
+++ b/routes/aside.php
查看文件 @5643268
@@ -263,6 +263,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/getAiPrefix', [Aside\Optimize\OptimizeController::class, 'getAiPrefix'])->name('admin.optimize_getAiPrefix');//获取Ai前后缀
         Route::any('/saveAiPrefix', [Aside\Optimize\OptimizeController::class, 'saveAiPrefix'])->name('admin.optimize_saveAiPrefix');//保存Ai前后缀
         Route::any('/setRobots', [Aside\Optimize\OptimizeController::class, 'setRobots'])->name('admin.optimize_setRobots');//设置robots开关
+        Route::any('/editTranslateStatus', [Aside\Optimize\OptimizeController::class, 'editTranslateStatus'])->name('admin.optimize_editTranslateStatus');//设置robots开关
     });
     //生成关键字
     Route::prefix('create_keyword')->group(function () {
--- a/routes/bside.php
查看文件 @5643268
+++ b/routes/bside.php
查看文件 @5643268
@@ -274,7 +274,7 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('inquiry')->group(function () {
         Route::get('/', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'index'])->name('inquiry');
         Route::get('/form_list', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'form_list'])->name('inquiry_form_list');
-        Route::get('/info', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'info'])->name('inquiry_info');
+        Route::any('/info', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'info'])->name('inquiry_info');
         Route::any('/delete', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'delete'])->name('inquiry_delete');
         Route::any('/export', [\App\Http\Controllers\Bside\Inquiry\InquiryController::class, 'export'])->name('inquiry_export');
     });