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

lyh
app/Console/Commands/UpdateRoute.php
app/Http/Controllers/Bside/Product/ExtendController.php
app/Http/Controllers/Bside/Product/ProductController.php
app/Http/Logic/Aside/Project/ProjectLogic.php
app/Services/SyncSubmitTaskService.php
routes/bside.php
--- a/app/Console/Commands/UpdateRoute.php
查看文件 @a3f03d5
+++ b/app/Console/Commands/UpdateRoute.php
查看文件 @a3f03d5
@@ -115,11 +115,11 @@ class UpdateRoute extends Command
             foreach ($lists as $v){
                 if(!empty($v['route'])){
                     $tag = "-tag";
-                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
+                    if (!(substr($v['route'], -strlen($tag)) === $tag)) {
+                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
 //                        $route = Translate::tran($v['route'], 'en').$tag;
                         // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-//                        $route = $v['route'].$tag;
-                        $route = rtrim($v['route'],$tag);
+                        $route = $v['route'].$tag;
                         $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
                         $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
 //                    }else{
@@ -127,10 +127,10 @@ class UpdateRoute extends Command
 //                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
 //                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                     }
-//                }else{
-//                    echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
-//                    $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-//                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                }else{
+                    echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
+                    $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                 }
                 echo date('Y-m-d H:i:s') . 'end :' . PHP_EOL;
             }
--- a/app/Http/Controllers/Bside/Product/ExtendController.php
查看文件 @a3f03d5
+++ b/app/Http/Controllers/Bside/Product/ExtendController.php
查看文件 @a3f03d5
@@ -70,4 +70,21 @@ class ExtendController extends BaseController
         $extendLogic->extendDel();
         $this->response('success');
     }
+
+
+    /**
+     * 可搜索的字段列表
+     * @author zbj
+     * @date 2024/1/22
+     */
+    public function search_filed(){
+        $map = [
+            'title' => '产品标题',
+            'intro' => '短描述',
+        ];
+        //文本框类型扩展字段
+        $extends = Extend::where('type', 1)->pluck('title', 'key')->toArray();
+        $data = array_merge($map, $extends);
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @a3f03d5
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @a3f03d5
@@ -246,7 +246,7 @@ class ProductController extends BaseController
         //获取当前用户选择的模版
         $v['video'] = json_decode($v['video'] ?? '');
         $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);
-        $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
+        $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id'] ?? 0);
         $v['url'] = $this->user['domain'].$v['route'];
         //获取当前数据扩展字段及值
         $v['extend'] = $this->getExtendInfo($v['id']);
--- a/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @a3f03d5
+++ b/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @a3f03d5
@@ -329,7 +329,8 @@ class ProjectLogic extends BaseLogic
         $config['filter_emails'] = Arr::a2s(!empty($config['filter_emails']) ? $config['filter_emails'] : []);
         $config['filter_mobiles'] = Arr::a2s(!empty($config['filter_mobiles']) ? $config['filter_mobiles'] : []);
         $config['filter_names'] = Arr::a2s(!empty($config['filter_names']) ? $config['filter_names'] : []);
-
+        $config['black_ips'] = $config['black_ips'] ?? '';
+        
         $model = InquiryFilterConfig::where('project_id', $config['project_id'])->first();
         if(!$model){
             $model = new InquiryFilterConfig();
--- a/app/Services/SyncSubmitTaskService.php
查看文件 @a3f03d5
+++ b/app/Services/SyncSubmitTaskService.php
查看文件 @a3f03d5
@@ -47,7 +47,9 @@ class SyncSubmitTaskService
             return false;
         }
-        ProjectServer::useProject($project['id']);
+        if(!ProjectServer::useProject($project['id'])){
+            return false;
+        }
         $action = $task['type'];
         $handler = new self();
@@ -133,7 +135,6 @@ class SyncSubmitTaskService
      * @date 2023/11/30
      */
     public static function checkIpCountry($domain, $ip, $type){
-        $domain = 'https://demo.globalso.site/';
         $project = Project::getProjectByDomain($domain);
         if(empty($project)){
             throw new InquiryFilterException('项目不存在');
@@ -210,11 +211,11 @@ class SyncSubmitTaskService
             if($config['filter_referers']){
                 //只比较path路径
                 $paths = array_map(function ($v){
-                    return parse_url(Url::to($v), PHP_URL_PATH);
+                    return trim(parse_url(Url::to($v), PHP_URL_PATH), '/');
                 },$config['filter_referers']);
                 //后端获取的referer
-                if(in_array(parse_url($data['referer'], PHP_URL_PATH), $paths)){
+                if(in_array(trim(parse_url($data['referer'], PHP_URL_PATH), '/'), $paths)){
                     throw new InquiryFilterException( '过滤来源链接：' . $data['referer']);
                 }
                 //前端获取的referer
--- a/routes/bside.php
查看文件 @a3f03d5
+++ b/routes/bside.php
查看文件 @a3f03d5
@@ -251,6 +251,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('extend', [\App\Http\Controllers\Bside\Product\ExtendController::class, 'lists'])->name('product_extend');
         Route::any('extend/save', [\App\Http\Controllers\Bside\Product\ExtendController::class, 'save'])->name('product_extend_save');
         Route::any('extend/del', [\App\Http\Controllers\Bside\Product\ExtendController::class, 'del'])->name('product_extend_del');
+        Route::any('extend/search_filed', [\App\Http\Controllers\Bside\Product\ExtendController::class, 'search_filed'])->name('product_extend_search_filed');
     });