合并分支 'master-lyh-edit' 到 'master'

剩余服务天数统一设置



查看合并请求 !530

@@ -549,13 +549,34 @@ class ProductController extends BaseController
      * @method :post
      * @method :post
      * @time   :2024/1/26 15:33
      * @time   :2024/1/26 15:33
      */
      */
-    public function sendAiProduct(){
+    public function sendAiProduct(Product $product){
         $this->request->validate([
         $this->request->validate([
             'keyword'=>'required',
             'keyword'=>'required',
+            'product_id'=>'required'
         ],[
         ],[
             'keyword.required' => 'keyword不能为空',
             'keyword.required' => 'keyword不能为空',
+            'product_id.required' => 'product_id不能为空',
         ]);
         ]);
-        $data = curl_c('http://title.globalso.com/ajax_data_for_web.php?keyword='.$this->param['keyword'],false);
-        $this->response('success',Code::SUCCESS,$data);
+        $productInfo = $product->read(['id' => $this->param['product_id']]);
+        if (empty($productInfo)) {
+            $this->fail('请选择有效产品信息！');
+        }
+        $productInfo = $this->handleParam($productInfo);
+        $keyword = generateRoute($this->param['keyword']);
+        $pre_suf = file_get_contents("http://www.quanqiusou.cn/get_prefix_suffix_api.php");
+        $pre_suf_array = json_decode($pre_suf,JSON_OBJECT_AS_ARRAY);
+        $search_info = file_get_contents("http://title.globalso.com/ajax_data_for_web.php?keyword=".$keyword);
+        if ($search_info) {
+            $new_info = explode(" - ",trim($search_info));
+            $new_title = str_replace('  ',' ',$pre_suf_array['prefix_title'][0].' '.$new_info[0]);
+            $tm_ky = explode(',',$new_info[1]);
+            $contents = $pre_suf_array['prefix'][0].' '.$new_title.', '.$pre_suf_array['suffix_s'][0]."\r\n";
+            $contents .= $pre_suf_array['prefix_title'][0].' '.implode(', ',$tm_ky).', '.$pre_suf_array['suffix_l'][0]."\r\n";
+            $new_content = htmlentities($contents);
+        }
+        if (FALSE == empty($data['new_content'])){
+            $productInfo['describe'] = $new_content . $productInfo['$data'];
+        }
+        $this->response('success',Code::SUCCESS,$productInfo);
     }
     }
 }
 }

@@ -76,7 +76,7 @@ class RankDataLogic extends BaseLogic
             'plan' => Project::planMap()[$project['deploy_build']['plan']],
             'plan' => Project::planMap()[$project['deploy_build']['plan']],
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'keyword_num' => $project['deploy_build']['keyword_num'],
             'compliance_day' => $project['finish_remain_day'] ?? 0,
             'compliance_day' => $project['finish_remain_day'] ?? 0,
-            'remain_day' => $project['deploy_build']['service_duration'] - ($project['finish_remain_day'] ?? 0),
+            'remain_day' => $project['remain_day'],
             'g_top_plan' => $project['deploy_optimize']['g_top_plan'] ?? [],
             'g_top_plan' => $project['deploy_optimize']['g_top_plan'] ?? [],
         ];
         ];
         //小语种列表
         //小语种列表

@@ -258,6 +258,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::post('category/sort', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'sort'])->name('product_category_sort');
         Route::post('category/sort', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'sort'])->name('product_category_sort');
         Route::any('category/delete', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'delete'])->name('product_category_delete');
         Route::any('category/delete', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'delete'])->name('product_category_delete');
         Route::any('category/allSort', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'allSort'])->name('product_category_allSort');
         Route::any('category/allSort', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'allSort'])->name('product_category_allSort');
+        Route::any('category/copyCategory', [\App\Http\Controllers\Bside\Product\CategoryController::class, 'copyCategory'])->name('product_category_copyCategory');
         //产品关键词
         //产品关键词
         Route::get('keyword', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'index'])->name('product_keyword');
         Route::get('keyword', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'index'])->name('product_keyword');
         Route::get('keyword/info', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'info'])->name('product_keyword_info');
         Route::get('keyword/info', [\App\Http\Controllers\Bside\Product\KeywordController::class, 'info'])->name('product_keyword_info');