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

@@ -75,7 +75,7 @@ class Count extends Command
                     //服务达标天数
                     //服务达标天数
                     $arr['compliance_day'] = $v['finish_remain_day'];
                     $arr['compliance_day'] = $v['finish_remain_day'];
                     //剩余服务时常
                     //剩余服务时常
-                    $arr['service_day'] = $v['remain_day'];
+                    $arr['service_day'] = $v['remain_day'] - 1;
                     //项目id
                     //项目id
                     $arr['project_id'] = $v['project_id'];
                     $arr['project_id'] = $v['project_id'];
                     $arr['created_at'] = date('Y-m-d H:i:s');
                     $arr['created_at'] = date('Y-m-d H:i:s');

@@ -164,4 +164,21 @@ class BlogCategoryController extends BaseController
         $blogCategoryLogic->setAllSort();
         $blogCategoryLogic->setAllSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :复制博客分类
+     * @name   :copyCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 9:14
+     */
+    public function copyCategory(BlogCategoryLogic $logic){
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'id不能为空',
+        ]);
+        $data = $logic->copyCategory();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -187,5 +187,20 @@ class CustomModuleCategoryController extends BaseController
         $this->response('success');
         $this->response('success');
     }
     }
 
 
-
+    /**
+     * @remark :复制新闻分类
+     * @name   :copyCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 9:14
+     */
+    public function copyCategory(CustomModuleCategoryLogic $logic){
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'id不能为空',
+        ]);
+        $data = $logic->copyCategory();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -168,13 +168,13 @@ class NewsCategoryController extends BaseController
      * @method :post
      * @method :post
      * @time   :2024/5/9 9:14
      * @time   :2024/5/9 9:14
      */
      */
-    public function copyCategory(NewsCategoryLogic $newsLogic){
+    public function copyCategory(NewsCategoryLogic $logic){
         $this->request->validate([
         $this->request->validate([
             'id'=>'required',
             'id'=>'required',
         ],[
         ],[
             'id.required' => 'id不能为空',
             'id.required' => 'id不能为空',
         ]);
         ]);
-        $data = $newsLogic->copyCategory();
+        $data = $logic->copyCategory();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -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);
     }
     }
 }
 }

@@ -27,6 +27,9 @@ class VisitController extends BaseController
      */
      */
     public function index(VisitLogic $logic)
     public function index(VisitLogic $logic)
     {
     {
+        if(isset($this->map['updated_date']) && !empty($this->param['updated_date'])){
+            $this->map['updated_date'] = ['between',$this->map['updated_date']];
+        }
         $data = $logic->getVisitList($this->map,$this->page,$this->row,$this->order);
         $data = $logic->getVisitList($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }

@@ -10,6 +10,7 @@ use App\Models\Blog\BlogCategory;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
 use App\Models\News\NewsCategory as NewsCategoryModel;
 use App\Models\News\NewsCategory as NewsCategoryModel;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
 class BlogCategoryLogic extends BaseLogic
 class BlogCategoryLogic extends BaseLogic
@@ -277,4 +278,70 @@ class BlogCategoryLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :复制新闻分类
+     * @name   :copyCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/9 9:16
+     */
+    public function copyCategory(){
+        $info = $this->model->read(['id'=>$this->param['id']]);
+        $param = [
+            'name'=>$info['name']."-copy",
+            'status'=>0,
+            'sort'=>$info['sort'],
+            'pid'=>0,
+            'remark'=>$info['remark'],
+            'alias'=>$info['alias'],
+            'project_id'=>$info['project_id'],
+            'operator_id'=>$this->user['id'],
+            'create_id'=>$this->user['id'],
+            'created_at'=>date('Y-m-d H:i:s'),
+            'updated_at'=>date('Y-m-d H:i:s'),
+        ];
+        $save_id = $this->model->insertGetId($param);
+        $route = RouteMap::setRoute($param['alias'], RouteMap::SOURCE_BLOG_CATE, $save_id, $this->user['project_id']);
+        $this->model->edit(['alias'=>$route],['id'=>$save_id]);
+        //同步可视化装修数据
+        $this->copyTemplate($this->param['id'],$info['project_id'],$save_id);
+        return $this->success(['id'=>$save_id]);
+    }
+
+    /**
+     * @remark :同步模版数据
+     * @name   :copyTemplate
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/29 15:53
+     */
+    public function copyTemplate($id,$project_id,$save_id){
+        $BTemplateModel = new BTemplate();
+        $list = $BTemplateModel->list(['source'=>BTemplate::SOURCE_BLOG,'is_list'=>BTemplate::IS_LIST,'is_custom'=>BTemplate::IS_NO_CUSTOM,'source_id'=>$id,'project_id'=>$project_id]);
+        if(!empty($list)){
+            $data = [];
+            foreach ($list as $v){
+                $data[] = [
+                    'html'=>$v['html'],
+                    'project_id'=>$v['project_id'],
+                    'source'=>$v['source'],
+                    'source_id'=>$save_id,
+                    'template_id'=>$v['template_id'],
+                    'section_list_id'=>$v['section_list_id'],
+                    'main_html'=>$v['main_html'],
+                    'main_css'=>$v['main_css'],
+                    'is_list'=>$v['is_list'],
+                    'type'=>$v['type'],
+                    'created_at'=>date('Y-m-d H:i:s'),
+                    'updated_at'=>date('Y-m-d H:i:s'),
+                ];
+            }
+            $rs = $BTemplateModel->insert($data);
+            if($rs === false){
+                $this->fail('error');
+            }
+        }
+        return $this->success();
+    }
 }
 }

@@ -9,10 +9,12 @@
 
 
 namespace App\Http\Logic\Bside\CustomModule;
 namespace App\Http\Logic\Bside\CustomModule;
 
 
+use App\Helper\Arr;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
 
 
 class CustomModuleCategoryLogic extends BaseLogic
 class CustomModuleCategoryLogic extends BaseLogic
 {
 {
@@ -247,4 +249,92 @@ class CustomModuleCategoryLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :复制扩展模块内容页
+     * @name   :copyModuleContentInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/4/28 16:32
+     */
+    public function copyCategory(){
+        $info = $this->model->read(['id'=>$this->param['id']]);
+        $param = $this->setContentParams($info);
+        $save_id = $this->model->insertGetId($param);
+        $this->copyTemplate($this->param['id'],$info['project_id'],$save_id,$info['module_id']);
+        $this->response('success');
+    }
+
+    /**
+     * @remark :字段处理
+     * @name   :setContentParams
+     * @author :lyh
+     * @method :post
+     * @time   :2024/4/28 16:33
+     */
+    public function setContentParams($info){
+        return [
+            'name'=>$info['name'].'-copy',
+            'status'=>$info['status'],
+            'sort'=>$info['sort'],
+            'pid'=>0,
+            'remark'=>$info['remark'],
+            'route'=>$info['route'],
+            'project_id'=>$info['project_id'],
+            'operator_id'=>$this->user['id'],
+            'module_id'=>$info['module_id'],
+            'image'=>$info['image'],
+            'created_at'=>date('Y-m-d H:i:s'),
+            'updated_at'=>date('Y-m-d H:i:s')
+        ];
+    }
+
+    /**
+     * @remark :同步模版数据
+     * @name   :copyTemplate
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/29 15:53
+     */
+    public function copyTemplate($id,$project_id,$save_id,$module_id){
+        $BTemplateModel = new BTemplate();
+        $list = $BTemplateModel->list(['source'=>$module_id,'source_id'=>$id,'is_list'=>BTemplate::IS_LIST,'is_custom'=>BTemplate::IS_CUSTOM,'project_id'=>$project_id]);
+        if(!empty($list)){
+            $data = [];
+            foreach ($list as $v){
+                $data[] = $this->setTemplateParams($v,$project_id,$save_id);
+            }
+            $rs = $BTemplateModel->insert($data);
+            if($rs === false){
+                $this->fail('error');
+            }
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :组装模版数据
+     * @name   :setTemplateParams
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/29 15:54
+     */
+    public function setTemplateParams($v,$project_id,$save_id){
+        $param = [
+            'html'=>$v['html'],
+            'project_id'=>$project_id,
+            'source'=>$v['source'],
+            'source_id'=>$save_id,
+            'template_id'=>$v['template_id'],
+            'section_list_id'=>$v['section_list_id'],
+            'main_html'=>$v['main_html'],
+            'main_css'=>$v['main_css'],
+            'is_custom'=>$v['is_custom'],
+            'is_list'=>$v['is_list'],
+            'type'=>$v['type'],
+            'created_at'=>$v['created_at'],
+            'updated_at'=>$v['updated_at']
+        ];
+        return $this->success($param);
+    }
 }
 }

@@ -443,7 +443,7 @@ class CustomModuleContentLogic extends BaseLogic
      */
      */
     public function copyTemplate($id,$project_id,$save_id,$module_id){
     public function copyTemplate($id,$project_id,$save_id,$module_id){
         $BTemplateModel = new BTemplate();
         $BTemplateModel = new BTemplate();
-        $list = $BTemplateModel->list(['source'=>$module_id,'source_id'=>$id,'is_custom'=>BTemplate::IS_CUSTOM,'project_id'=>$project_id]);
+        $list = $BTemplateModel->list(['source'=>$module_id,'source_id'=>$id,'is_list'=>BTemplate::IS_DETAIL,'is_custom'=>BTemplate::IS_CUSTOM,'project_id'=>$project_id]);
         if(!empty($list)){
         if(!empty($list)){
             $data = [];
             $data = [];
             foreach ($list as $v){
             foreach ($list as $v){

@@ -46,6 +46,7 @@ class CountLogic extends BaseLogic
         //获取项目的剩余时长
         //获取项目的剩余时长
         $projectModel = new Project();
         $projectModel = new Project();
         $projectInfo = $projectModel->read(['id'=>$this->user['project_id']],['remain_day','finish_remain_day']);
         $projectInfo = $projectModel->read(['id'=>$this->user['project_id']],['remain_day','finish_remain_day']);
+        $info['service_day'] = $projectInfo['remain_day'];
         $info['compliance_day'] = $projectInfo['finish_remain_day'];
         $info['compliance_day'] = $projectInfo['finish_remain_day'];
         return $this->success($info);
         return $this->success($info);
     }
     }

@@ -149,37 +149,12 @@ class KeywordLogic extends  BaseLogic
         }catch (\Exception $e){
         }catch (\Exception $e){
             return false;
             return false;
         }
         }
+        Common::del_user_cache('product_keyword',$this->user['project_id']);
         NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD, ['project_id' => $this->user['project_id']]);
         NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD, ['project_id' => $this->user['project_id']]);
         return $this->success();
         return $this->success();
     }
     }
 
 
     /**
     /**
-     * @remark :
-     * @name   :specialRouteCheck
-     * @author :lyh
-     * @method :post
-     * @time   :2024/1/6 14:50
-     */
-    public function specialRouteCheck($title)
-    {
-        if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
-            $title = Translate::tran($title, 'en');
-        }
-        $suffix = '-tag';
-        $i = 1;
-        $sign = generateRoute($title);
-        $route = $sign . $suffix;
-        resetRoute:
-        $log = RouteMap::getRouteInfo($route, $this->user['project_id']);
-        if ($log) {
-            $route = $sign .'-'.$i.$suffix;
-            $i++;
-            goto resetRoute;
-        }
-        return $route;
-    }
-
-    /**
      * @remark :删除标签
      * @remark :删除标签
      * @name   :keywordDelete
      * @name   :keywordDelete
      * @author :lyh
      * @author :lyh

@@ -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'] ?? [],
         ];
         ];
         //小语种列表
         //小语种列表

@@ -123,6 +123,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/category/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'save'])->name('blog_category_edit');
         Route::any('/category/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'save'])->name('blog_category_edit');
         Route::any('/category/del', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'del'])->name('blog_category_del');
         Route::any('/category/del', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'del'])->name('blog_category_del');
         Route::any('/category/allSort', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'allSort'])->name('blog_category_allSort');
         Route::any('/category/allSort', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'allSort'])->name('blog_category_allSort');
+        Route::any('/category/copyCategory', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'copyCategory'])->name('blog_category_copyCategory');
         Route::any('/category/status', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'status'])->name('blog_category_status');
         Route::any('/category/status', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'status'])->name('blog_category_status');
         Route::any('/category/sort', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'sort'])->name('blog_category_sort');
         Route::any('/category/sort', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'sort'])->name('blog_category_sort');
         Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'categoryTopList'])->name('blog_category_categoryTopList');
         Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'categoryTopList'])->name('blog_category_categoryTopList');
@@ -257,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');